* morituri/common/checksum.py:

* morituri/common/encode.py:
	* morituri/image/table.py:
	* morituri/rip/cd.py:
	* morituri/rip/image.py:
	* morituri/rip/offset.py:
	* morituri/test/test_common_accurip.py:
	* morituri/test/test_common_checksum.py:
	* morituri/test/test_image_cue.py:
	* morituri/test/test_image_table.py:
	  Pychecker fixes.

ChangeLog

@@ -1,3 +1,17 @@
+2011-05-21  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/checksum.py:
+	* morituri/common/encode.py:
+	* morituri/image/table.py:
+	* morituri/rip/cd.py:
+	* morituri/rip/image.py:
+	* morituri/rip/offset.py:
+	* morituri/test/test_common_accurip.py:
+	* morituri/test/test_common_checksum.py:
+	* morituri/test/test_image_cue.py:
+	* morituri/test/test_image_table.py:
+	  Pychecker fixes.
+
 2011-05-21  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/checksum.py:

morituri/common/checksum.py

@@ -373,7 +373,6 @@ class TRMTask(GstPipelineTask):
 
     def paused(self):
         gst.debug('query duration')
-        sink = self.pipeline.get_by_name('sink')
 
         self._length, qformat = self.pipeline.query_duration(gst.FORMAT_TIME)
         gst.debug('total length: %r' % self._length)

morituri/common/encode.py

@@ -25,7 +25,7 @@ import os
 import shutil
 import tempfile
 
-from morituri.common import common, task
+from morituri.common import common, task, log
 
 class Profile(object):
     name = None
@@ -169,7 +169,7 @@ class EncodeTask(task.Task):
             decodebin name=decoder !
             audio/x-raw-int,width=16,depth=16,channels=2 !
             level name=level !
-            %s !
+            %s ! identity name=identity !
             filesink location="%s" name=sink''' % (
                 common.quoteParse(self._inpath).encode('utf-8'),
                 self._profile.pipeline,
@@ -196,9 +196,10 @@ class EncodeTask(task.Task):
         self.debug('paused pipeline')
 
         # get length
+        identity = self._pipeline.get_by_name('identity')
         self.debug('query duration')
         try:
-            length, qformat = tagger.query_duration(gst.FORMAT_DEFAULT)
+            length, qformat = identity.query_duration(gst.FORMAT_DEFAULT)
         except gst.QueryError, e:
             self.setException(e)
             self.stop()

morituri/image/table.py

@@ -28,7 +28,7 @@ import copy
 import urllib
 import urlparse
 
-from morituri.common import task, common, log
+from morituri.common import common, log
 
 # FIXME: taken from libcdio, but no reference found for these
 

morituri/rip/cd.py

@@ -29,8 +29,7 @@ gobject.threads_init()
 from morituri.common import logcommand, task, common, accurip, log
 from morituri.common import drive, program
 from morituri.result import result
-from morituri.image import image, cue, table
-from morituri.program import cdrdao, cdparanoia
+from morituri.program import cdrdao
 
 
 class Rip(logcommand.LogCommand):

morituri/rip/image.py

@@ -23,9 +23,8 @@
 import os
 
 from morituri.common import logcommand, task, accurip, program, encode
-from morituri.image import image, cue
+from morituri.image import image
 from morituri.result import result
-from morituri.program import cdrdao, cdparanoia
 
 
 class Encode(logcommand.LogCommand):

morituri/rip/offset.py

@@ -27,7 +27,6 @@ import gobject
 gobject.threads_init()
 
 from morituri.common import logcommand, task, accurip, drive, program
-from morituri.image import image
 from morituri.program import cdrdao, cdparanoia
 
 # see http://www.accuraterip.com/driveoffsets.htm

morituri/test/test_common_accurip.py

@@ -2,11 +2,12 @@
 # vi:si:et:sw=4:sts=4:ts=4
 
 import os
-import unittest
 
-from morituri.common import accurip, common
+from morituri.common import accurip
 
-class AccurateRipResponseTestCase(unittest.TestCase):
+from morituri.test import common as tcommon
+
+class AccurateRipResponseTestCase(tcommon.TestCase):
     def testResponse(self):
         path = os.path.join(os.path.dirname(__file__),
             'dBAR-011-0010e284-009228a3-9809ff0b.bin')

morituri/test/test_common_checksum.py

@@ -7,12 +7,7 @@ import tempfile
 import gobject
 gobject.threads_init()
 
-import gst
-
-from morituri.test import common
-
-from morituri.common import task, checksum, log, common
-from morituri.image import image
+from morituri.common import task, checksum, log
 
 from morituri.test import common as tcommon
 

morituri/test/test_image_cue.py

@@ -5,8 +5,6 @@ import os
 import tempfile
 import unittest
 
-from morituri.test import common
-
 from morituri.image import table, cue
 
 class KingsSingleTestCase(unittest.TestCase):

morituri/test/test_image_table.py

@@ -3,14 +3,12 @@
 
 from morituri.image import table
 
-import unittest
-
-from morituri.test import common
+from morituri.test import common as tcommon
 
 def h(i):
     return "0x%08x" % i
 
-class LadyhawkeTestCase(unittest.TestCase):
+class LadyhawkeTestCase(tcommon.TestCase):
     # Ladyhawke - Ladyhawke - 0602517818866
     # contains 12 audio tracks and one data track
     # CDDB has been verified against freedb:
@@ -54,7 +52,7 @@ class LadyhawkeTestCase(unittest.TestCase):
         self.assertEquals(self.table.getAccurateRipURL(),
         "http://www.accuraterip.com/accuraterip/a/5/d/dBAR-012-0013bd5a-00b8d489-c60af50d.bin")
 
-class MusicBrainzTestCase(unittest.TestCase):
+class MusicBrainzTestCase(tcommon.TestCase):
     # example taken from http://musicbrainz.org/doc/DiscIDCalculation
     # disc is Ettella Diamant