[SCM] morituri/master: pychecker cleanup

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d75066d1bbbbb5ba2f5468da5cfe4403cb325047
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Jun 7 13:46:26 2009 +0000

    pychecker cleanup

diff --git a/morituri/common/encode.py b/morituri/common/encode.py
index 22c6349..9fc52df 100644
--- a/morituri/common/encode.py
+++ b/morituri/common/encode.py
@@ -20,10 +20,7 @@
 # You should have received a copy of the GNU General Public License
 # along with morituri.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
 import math
-import struct
-import zlib
 
 import gst
 
@@ -140,7 +137,6 @@ class EncodeTask(task.Task):
         self.debug('paused pipeline')
 
         # get length
-        decoder = self._pipeline.get_by_name('decoder')
         self.debug('query duration')
         length, format = muxer.query_duration(gst.FORMAT_DEFAULT)
         # wavparse 0.10.14 returns in bytes
diff --git a/morituri/image/image.py b/morituri/image/image.py
index ff33870..a22f51c 100644
--- a/morituri/image/image.py
+++ b/morituri/image/image.py
@@ -151,7 +151,7 @@ class AudioLengthTask(task.Task):
 
         try:
             length, format = sink.query_duration(gst.FORMAT_DEFAULT)
-        except gst.QueryError, e:
+        except gst.QueryError:
             print 'failed to query %s' % self._path
         # wavparse 0.10.14 returns in bytes
         if format == gst.FORMAT_BYTES:
diff --git a/morituri/image/table.py b/morituri/image/table.py
index f497302..75cdb5c 100644
--- a/morituri/image/table.py
+++ b/morituri/image/table.py
@@ -144,7 +144,7 @@ class Table(object, log.Loggable):
     catalog = None # catalog number; FIXME: is this UPC ?
     cdtext = None
 
-    classVersion = 1
+    classVersion = 2
 
     def __init__(self, tracks=None):
         if not tracks:
diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
index 1d5517d..2bc0d89 100644
--- a/morituri/program/cdparanoia.py
+++ b/morituri/program/cdparanoia.py
@@ -96,7 +96,6 @@ class ProgressParser(object):
         if wordOffset % common.WORDS_PER_FRAME != 0:
             print 'THOMAS: not a multiple of %d: %d' % (
                 common.WORDS_PER_FRAME, wordOffset)
-            print line
             return
 
         frameOffset = wordOffset / common.WORDS_PER_FRAME
diff --git a/morituri/result/logger.py b/morituri/result/logger.py
index 05bbf1c..715eb2f 100644
--- a/morituri/result/logger.py
+++ b/morituri/result/logger.py
@@ -20,7 +20,6 @@
 # You should have received a copy of the GNU General Public License
 # along with morituri.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
 import time
 
 from morituri.common import common
diff --git a/morituri/rip/drive.py b/morituri/rip/drive.py
index c854463..6f45626 100644
--- a/morituri/rip/drive.py
+++ b/morituri/rip/drive.py
@@ -31,7 +31,7 @@ class List(logcommand.LogCommand):
         try:
             import pycdio
             import cdio
-        except ImportError, e:
+        except ImportError:
             self.info('pycdio not installed, cannot list drives')
             found = False
             for c in ['/dev/cdrom', '/dev/cdrecorder']:

-- 
morituri packaging