[SCM] morituri/master: * 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.
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:09:23 UTC 2014
The following commit has been merged in the master branch:
commit c301015537c5db269721b6a48ec91d1412009dfd
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Sat May 21 11:50:39 2011 +0000
* 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.
diff --git a/ChangeLog b/ChangeLog
index 8ed24f5..9af9e33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,20 @@
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:
Actually raise the exception.
* morituri/common/task.py:
Document interface more clearly.
diff --git a/morituri/common/checksum.py b/morituri/common/checksum.py
index d525b89..14b61ef 100644
--- a/morituri/common/checksum.py
+++ b/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)
diff --git a/morituri/common/encode.py b/morituri/common/encode.py
index 0d27c21..69a7726 100644
--- a/morituri/common/encode.py
+++ b/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()
diff --git a/morituri/image/table.py b/morituri/image/table.py
index 19921cf..56be444 100644
--- a/morituri/image/table.py
+++ b/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
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index cbc8ed4..ef0481a 100644
--- a/morituri/rip/cd.py
+++ b/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):
diff --git a/morituri/rip/image.py b/morituri/rip/image.py
index 0584c6c..98f8b88 100644
--- a/morituri/rip/image.py
+++ b/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):
diff --git a/morituri/rip/offset.py b/morituri/rip/offset.py
index 36f71d5..71f21f8 100644
--- a/morituri/rip/offset.py
+++ b/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
diff --git a/morituri/test/test_common_accurip.py b/morituri/test/test_common_accurip.py
index 484642a..bd15721 100644
--- a/morituri/test/test_common_accurip.py
+++ b/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')
diff --git a/morituri/test/test_common_checksum.py b/morituri/test/test_common_checksum.py
index 07af930..09fbf90 100644
--- a/morituri/test/test_common_checksum.py
+++ b/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
diff --git a/morituri/test/test_image_cue.py b/morituri/test/test_image_cue.py
index cdcb657..c559ef1 100644
--- a/morituri/test/test_image_cue.py
+++ b/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):
diff --git a/morituri/test/test_image_table.py b/morituri/test/test_image_table.py
index 3b4e1e4..7c810f3 100644
--- a/morituri/test/test_image_table.py
+++ b/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
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list