[SCM] morituri/master: remove code.interact fix another unicode oversight

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f3bf6220fbcd33fa2297b9ea05a23db945288aa6
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Fri Sep 11 15:50:45 2009 +0000

    remove code.interact
    fix another unicode oversight

diff --git a/HACKING b/HACKING
index d71e7d1..4def318 100644
--- a/HACKING
+++ b/HACKING
@@ -28,3 +28,4 @@ unicode
 - morituri.extern.log.log is not unicode-safe; don't pass it unicode objects;
   for example, always use %r to log paths
 - run with RIP_DEBUG=5 once in a while to catch unicode/logging errors.
+- Also use unicode prefix/suffix in tempfile.* methods; to force unicode.
diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py
index 74cdabf..5e71818 100644
--- a/morituri/program/cdrdao.py
+++ b/morituri/program/cdrdao.py
@@ -282,7 +282,6 @@ class CDRDAOTask(task.Task):
         except Exception, e:
             self.debug('exception during _read()')
             self.debug(log.getExceptionMessage(e))
-            import code; code.interact(local=locals())
             self.exception = e
             self.stop()
 
@@ -395,7 +394,7 @@ class ReadSessionTask(CDRDAOTask):
         CDRDAOTask.__init__(self)
         self.parser = OutputParser(self)
         (fd, self._tocfilepath) = tempfile.mkstemp(
-            suffix='.readtablesession.morituri')
+            suffix=u'.readtablesession.morituri')
         os.close(fd)
         os.unlink(self._tocfilepath)
 

-- 
morituri packaging