* HACKING:

More unicode notes.
	* morituri/common/program.py:
	* morituri/image/table.py:
	* morituri/image/toc.py:
	* morituri/result/result.py:
	* morituri/rip/cd.py:
	* morituri/test/test_image_toc.py:
	  Further unicode fixes, for options, CD-Text, paths, ...

morituri/common/program.py

@@ -213,12 +213,17 @@ class Program(log.Loggable):
         Also works for the disc name, using disc variables for the template.
 
         @param outdir:   the directory where to write the files
-        @type  outdir:   str
+        @type  outdir:   unicode
         @param template: the template for writing the file
-        @type  template: str
+        @type  template: unicode
         @param i:        track number (0 for HTOA)
         @type  i:        int
+
+        @rtype: unicode
         """
+        assert type(outdir) is unicode, "%r is not unicode" % outdir
+        assert type(template) is unicode, "%r is not unicode" % template
+
         # returns without extension
 
         v = {}