[SCM] morituri/master: * morituri/program/cdparanoia.py: * morituri/rip/offset.py: Another unicode fix.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ce7b5762f7b37bfb5fe5480c2aa1b61a603587df
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sat Sep 12 17:23:39 2009 +0000

    	* morituri/program/cdparanoia.py:
    	* morituri/rip/offset.py:
    	  Another unicode fix.

diff --git a/ChangeLog b/ChangeLog
index c257737..0048ec8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-09-12  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/program/cdparanoia.py:
+	* morituri/rip/offset.py:
+	  Another unicode fix.
+
+2009-09-12  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* HACKING:
 	  More unicode notes.
 	* morituri/common/program.py:
diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
index c064b3b..7975309 100644
--- a/morituri/program/cdparanoia.py
+++ b/morituri/program/cdparanoia.py
@@ -183,7 +183,7 @@ class ReadTrackTask(task.Task):
         Read the given track.
 
         @param path:   where to store the ripped track
-        @type  path:   str
+        @type  path:   unicode
         @param table:  table of contents of CD
         @type  table:  L{table.Table}
         @param start:  first frame to rip
@@ -195,6 +195,8 @@ class ReadTrackTask(task.Task):
         @param device: the device to rip from
         @type  device: str
         """
+        assert type(path) is unicode, "%r is not unicode" % path
+
         self.path = path
         self._table = table
         self._start = start
diff --git a/morituri/rip/offset.py b/morituri/rip/offset.py
index 2139eca..5284ea0 100644
--- a/morituri/rip/offset.py
+++ b/morituri/rip/offset.py
@@ -155,7 +155,7 @@ CD in the AccurateRip database."""
         self.debug('Ripping track %r with offset %d ...', track, offset)
 
         fd, path = tempfile.mkstemp(
-            suffix='.track%02d.offset%d.morituri.wav' % (
+            suffix=u'.track%02d.offset%d.morituri.wav' % (
                 track, offset))
         os.close(fd)
 

-- 
morituri packaging