[SCM] morituri/master: * morituri/program/cdparanoia.py: explicitize keyword args. Break some 80+ lines.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5cf823a6404be8829373810e7f02d391d52a7299
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sat Sep 19 11:58:33 2009 +0000

    	* morituri/program/cdparanoia.py:
    	  explicitize keyword args.
    	  Break some 80+ lines.

diff --git a/ChangeLog b/ChangeLog
index 0c523e2..1be1d3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-09-19  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/program/cdparanoia.py:
+	  explicitize keyword args.
+	  Break some 80+ lines.
+
+2009-09-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/rip/offset.py:
 	  Pass device parameter to ReadTrackTask.  Thanks to Alex B for
 	  spotting this on my blog.
diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
index 7975309..fcb67d7 100644
--- a/morituri/program/cdparanoia.py
+++ b/morituri/program/cdparanoia.py
@@ -225,9 +225,12 @@ class ReadTrackTask(task.Task):
                 stopTrack = i + 1
                 stopOffset = self._stop - self._table.getTrackStart(i + 1)
 
-        self.debug('Ripping from %d to %d (inclusive)', self._start, self._stop)
-        self.debug('Starting at track %d, offset %d', startTrack, startOffset)
-        self.debug('Stopping at track %d, offset %d', stopTrack, stopOffset)
+        self.debug('Ripping from %d to %d (inclusive)',
+            self._start, self._stop)
+        self.debug('Starting at track %d, offset %d',
+            startTrack, startOffset)
+        self.debug('Stopping at track %d, offset %d',
+            stopTrack, stopOffset)
 
         bufsize = 1024
         argv = ["cdparanoia", "--stderr-progress",
@@ -370,9 +373,11 @@ class ReadVerifyTrackTask(task.MultiSeparateTask):
 
         self.tasks = []
         self.tasks.append(
-            ReadTrackTask(tmppath, table, start, stop, offset, device))
+            ReadTrackTask(tmppath, table, start, stop,
+                offset=offset, device=device))
         self.tasks.append(checksum.CRC32Task(tmppath))
-        t = ReadTrackTask(tmppath, table, start, stop, offset, device)
+        t = ReadTrackTask(tmppath, table, start, stop,
+            offset=offset, device=device)
         t.description = 'Verifying track...'
         self.tasks.append(t)
         self.tasks.append(checksum.CRC32Task(tmppath))

-- 
morituri packaging