[SCM] morituri/master: pychecker fixes

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Oct 19 20:09:02 UTC 2014


The following commit has been merged in the master branch:
commit 41c92fcda4ef5317b6494a73eb4f95a0fd3059bf
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Fri May 22 20:44:10 2009 +0000

    pychecker fixes

diff --git a/morituri/common/checksum.py b/morituri/common/checksum.py
index 517d75f..3c9c60e 100644
--- a/morituri/common/checksum.py
+++ b/morituri/common/checksum.py
@@ -21,11 +21,9 @@
 # along with morituri.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import sys
 import struct
 import zlib
 
-import gobject
 import gst
 
 from morituri.common import common, task
diff --git a/morituri/common/renamer.py b/morituri/common/renamer.py
index ae14526..ee60af4 100644
--- a/morituri/common/renamer.py
+++ b/morituri/common/renamer.py
@@ -21,7 +21,6 @@
 # along with morituri.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import sys
 import tempfile
 
 """
diff --git a/morituri/configure/installed.py.in b/morituri/configure/installed.py.in
index a0cb324..3fb6ba1 100644
--- a/morituri/configure/installed.py.in
+++ b/morituri/configure/installed.py.in
@@ -1,8 +1,6 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-import os
-
 def get():
     return {
         'isinstalled':   True,
diff --git a/morituri/image/cue.py b/morituri/image/cue.py
index 758300d..f34f1fa 100644
--- a/morituri/image/cue.py
+++ b/morituri/image/cue.py
@@ -111,7 +111,7 @@ class CueFile(object, log.Loggable):
                 state = 'TRACK'
 
                 trackNumber = int(m.group('track'))
-                trackMode = m.group('mode')
+                #trackMode = m.group('mode')
 
                 self.debug('found track %d', trackNumber)
                 currentTrack = table.Track(trackNumber)
diff --git a/morituri/image/image.py b/morituri/image/image.py
index 77dd840..7fbdf84 100644
--- a/morituri/image/image.py
+++ b/morituri/image/image.py
@@ -24,7 +24,6 @@
 Wrap on-disk CD images based on the .cue file.
 """
 
-import os
 import struct
 
 import gst
@@ -234,7 +233,7 @@ class AccurateRipResponse(object):
         self.checksums = []
 
         pos = 13
-        for i in range(self.trackCount):
+        for _ in range(self.trackCount):
             confidence = struct.unpack("B", data[pos])[0]
             checksum = "%08x" % struct.unpack("<L", data[pos + 1:pos + 5])[0]
             pos += 9
diff --git a/morituri/image/table.py b/morituri/image/table.py
index 0d20c90..212b699 100644
--- a/morituri/image/table.py
+++ b/morituri/image/table.py
@@ -24,11 +24,6 @@
 Wrap Table of Contents.
 """
 
-import os
-import struct
-
-import gst
-
 from morituri.common import task, common, log
 
 # FIXME: taken from libcdio, but no reference found for these
@@ -166,7 +161,6 @@ class Table(object, log.Loggable):
         @returns: the length of the given track number, in CD frames
         @rtype:   int
         """
-        track = self.tracks[number - 1]
         return self.getTrackEnd(number) - self.getTrackStart(number) + 1
 
     def getAudioTracks(self):
@@ -362,7 +356,6 @@ class Table(object, log.Loggable):
         # add the first FILE line
         path = self.tracks[0].getFirstIndex().path
         counter = self.tracks[0].getFirstIndex().counter
-        currentPath = path
         lines.append('FILE "%s" WAVE' % path)
 
         for i, track in enumerate(self.tracks):
@@ -407,8 +400,6 @@ class Table(object, log.Loggable):
         t = self.tracks[0].number
         index = self.tracks[0].getFirstIndex()
         i = index.number
-        # the first cut is the deepest
-        counter = index.counter
 
         self.debug('clearing path')
         while True:
diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
index 234f0bc..d21e414 100644
--- a/morituri/program/cdparanoia.py
+++ b/morituri/program/cdparanoia.py
@@ -63,7 +63,7 @@ class ProgressParser(object):
         """
         m = _PROGRESS_RE.search(line)
         if m:
-            code = int(m.group('code'))
+            # code = int(m.group('code'))
             function = m.group('function')
             offset = int(m.group('offset'))
             if function == 'read':
diff --git a/morituri/test/test_common_renamer.py b/morituri/test/test_common_renamer.py
index e2d824e..5fbf1f2 100644
--- a/morituri/test/test_common_renamer.py
+++ b/morituri/test/test_common_renamer.py
@@ -2,7 +2,6 @@
 # vi:si:et:sw=4:sts=4:ts=4
 
 import os
-import stat
 import tempfile
 
 import unittest
diff --git a/morituri/test/test_image_image.py b/morituri/test/test_image_image.py
index 09e62bd..7468235 100644
--- a/morituri/test/test_image_image.py
+++ b/morituri/test/test_image_image.py
@@ -61,7 +61,6 @@ class TrackSeparateTestCase(unittest.TestCase):
         self.assertEquals(h(checksumtask.checksums[3]), '0x7271db39')
 
     def testLength(self):
-        tracks = self.image.cue.table.tracks
         self.assertEquals(self.image.table.getTrackLength(1), 10)
         self.assertEquals(self.image.table.getTrackLength(2), 10)
         self.assertEquals(self.image.table.getTrackLength(3), 10)
diff --git a/morituri/test/test_image_table.py b/morituri/test/test_image_table.py
index d8d275b..8aea419 100644
--- a/morituri/test/test_image_table.py
+++ b/morituri/test/test_image_table.py
@@ -1,7 +1,6 @@
 # -*- Mode: Python; test-case-name: morituri.test.test_image_table -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-import os
 import unittest
 
 from morituri.image import table
diff --git a/morituri/test/test_image_toc.py b/morituri/test/test_image_toc.py
index 4c9f88d..c8a7386 100644
--- a/morituri/test/test_image_toc.py
+++ b/morituri/test/test_image_toc.py
@@ -54,11 +54,6 @@ class CureTestCase(unittest.TestCase):
         self._assertAbsolute(2, 1, 28324)
         self._assertPath(1, 1, "data.wav")
 
-        def dump():
-            for t in self.toc.table.tracks:
-                print t
-                print t.indexes.values()
-
         self.toc.table.absolutize()
         self.toc.table.clearFiles()
 

-- 
morituri packaging



More information about the pkg-multimedia-commits mailing list