Changeset 442

Timestamp:

21-05-11 13:50:39 (2 years ago)

Author:

thomas

Message:

• 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.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• morituri/common/checksum.py (modified) (1 diff)
• morituri/common/encode.py (modified) (3 diffs)
• morituri/image/table.py (modified) (1 diff)
• morituri/rip/cd.py (modified) (1 diff)
• morituri/rip/image.py (modified) (1 diff)
• morituri/rip/offset.py (modified) (1 diff)
• morituri/test/test_common_accurip.py (modified) (1 diff)
• morituri/test/test_common_checksum.py (modified) (1 diff)
• morituri/test/test_image_cue.py (modified) (1 diff)
• morituri/test/test_image_table.py (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+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>
 

trunk/morituri/common/checksum.py

@@ -374 +374 @@
     def paused(self):
         gst.debug('query duration')
-        sink = self.pipeline.get_by_name('sink')
 
         self._length, qformat = self.pipeline.query_duration(gst.FORMAT_TIME)

trunk/morituri/common/encode.py

@@ -26 +26 @@
 import tempfile
 
-from morituri.common import common, task
+from morituri.common import common, task, log
 
 class Profile(object):
@@ -170 +170 @@
             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'),
@@ -197 +197 @@
 
         # 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)

trunk/morituri/image/table.py

@@ -29 +29 @@
 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

trunk/morituri/rip/cd.py

@@ -30 +30 @@
 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
 
 

trunk/morituri/rip/image.py

@@ -24 +24 @@
 
 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
 
 

trunk/morituri/rip/offset.py

@@ -28 +28 @@
 
 from morituri.common import logcommand, task, accurip, drive, program
-from morituri.image import image
 from morituri.program import cdrdao, cdparanoia
 

trunk/morituri/test/test_common_accurip.py

@@ -3 +3 @@
 
 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__),

trunk/morituri/test/test_common_checksum.py

@@ -8 +8 @@
 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

trunk/morituri/test/test_image_cue.py

@@ -5 +5 @@
 import tempfile
 import unittest
-
-from morituri.test import common
 
 from morituri.image import table, cue

trunk/morituri/test/test_image_table.py

@@ -4 +4 @@
 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
@@ -55 +53 @@
         "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