[SCM] morituri/master: * morituri/common/program.py: * morituri/rip/debug.py: Pychecker fixes.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e60b6d84419245694f3c5128a5c6a47f042a2bf9
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Aug 14 14:20:06 2011 +0000

    	* morituri/common/program.py:
    	* morituri/rip/debug.py:
    	  Pychecker fixes.

diff --git a/ChangeLog b/ChangeLog
index c331b9c..48a3bfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-08-14  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/common/program.py:
+	* morituri/rip/debug.py:
+	  Pychecker fixes.
+
+2011-08-14  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* TODO:
 	  Add a note about das capital disc.
 	* morituri/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml:
diff --git a/morituri/common/program.py b/morituri/common/program.py
index cfa1e22..e585457 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -355,7 +355,7 @@ class Program(log.Loggable):
         ret = None
 
         metadatas = None
-        for i in range(0, 4):
+        for _ in range(0, 4):
             try:
                 metadatas = musicbrainz(mbdiscid)
             except MusicBrainzException, e:
diff --git a/morituri/rip/debug.py b/morituri/rip/debug.py
index 116c089..8e076d4 100644
--- a/morituri/rip/debug.py
+++ b/morituri/rip/debug.py
@@ -28,10 +28,6 @@ class Checksum(logcommand.LogCommand):
 
     summary = "run a checksum task"
 
-    def addOptions(self):
-        # here to avoid import gst eating our options
-        from morituri.common import checksum
-
     def do(self, args):
         try:
             fromPath = unicode(args[0])
@@ -41,6 +37,7 @@ class Checksum(logcommand.LogCommand):
 
         runner = task.SyncRunner()
 
+        # here to avoid import gst eating our options
         from morituri.common import checksum
         checksumtask = checksum.CRC32Task(fromPath)
 

-- 
morituri packaging