Fix #904

src/calibre/ebooks/lrf/lit/convert_from.py

@@ -9,7 +9,7 @@ from calibre.ebooks.lit.reader import LitReader
 from calibre.ebooks import ConversionError
 from calibre.ebooks.lrf.html.convert_from import process_file as html_process_file
 from calibre.ebooks.metadata.opf import OPFReader
-from calibre import isosx, __appname__, setup_cli_handlers, iswindows, islinux
+from calibre import isosx, __appname__, setup_cli_handlers, islinux
 
 CLIT = 'clit'
 if isosx and hasattr(sys, 'frameworks_dir'):
@@ -42,10 +42,9 @@ def generate_html(pathtolit, logger):
         raise ConversionError, 'Cannot read from ' + pathtolit
     tdir = mkdtemp(prefix=__appname__+'_')
     os.rmdir(tdir)
-    sep = r'\\' if iswindows else os.path.sep
-    cmd = ' '.join([CLIT, '"'+pathtolit+'"', '"%s"'%(tdir+sep,)])
-    logger.debug(cmd)
-    p = Popen(cmd, shell=True, stderr=PIPE, stdout=PIPE)
+    cmd = [CLIT, pathtolit, '%s'%(tdir+os.sep)]
+    logger.debug(repr(cmd))
+    p = Popen(cmd, stderr=PIPE, stdout=PIPE)
     stdout = p.stdout.read()
     err = p.stderr.read()     
     logger.info(p.stdout.read())

src/calibre/gui2/jobs.py

@@ -126,7 +126,7 @@ class ConversionJob(Job):
     def formatted_error(self):
         if self.exception is None:
             return ''
-        ans = u'<p><b>%s</b>:'%self.exception
+        ans = u'<p><b>%s</b>:'%repr(self.exception)
         ans += '<h2>Traceback:</h2><pre>%s</pre>'%self.last_traceback
         return ans
     

src/calibre/gui2/pictureflow/PyQt/configure.py

@@ -1,5 +1,4 @@
 import os, sys, glob
-import sipconfig
 if os.environ.get('PYQT4PATH', None):
     print os.environ['PYQT4PATH']
     sys.path.insert(0, os.environ['PYQT4PATH'])