[py-svn] r37010 - py/dist/py/rest

[cfbolz at codespeak.net]

Author: cfbolz
Date: Fri Jan 19 17:04:25 2007
New Revision: 37010

Modified:
   py/dist/py/rest/convert.py
Log:
quote args, so that spaces in the paths are no problem


Modified: py/dist/py/rest/convert.py
==============================================================================
--- py/dist/py/rest/convert.py	(original)
+++ py/dist/py/rest/convert.py	Fri Jan 19 17:04:25 2007
@@ -16,9 +16,9 @@
         raise SystemExit("neither ps2eps nor ps2epsi found")
     try:
         eps = ps.new(ext=".eps")
-        py.process.cmdexec("ps2epsi %s %s" % (ps, eps))
+        py.process.cmdexec('ps2epsi "%s" "%s"' % (ps, eps))
     except ExecutionFailed:
-        py.process.cmdexec("ps2eps -l -f %s" % ps)
+        py.process.cmdexec('ps2eps -l -f "%s"' % ps)
 
 def ps2pdf(ps, compat_level="1.2"):
     if not py.path.local.sysfind("gs"):
@@ -36,12 +36,12 @@
     # XXX write a pure python version
     if not py.path.local.sysfind("epstopdf"):
         raise SystemExit("ERROR: epstopdf not found")
-    py.process.cmdexec("epstopdf %s" % eps)
+    py.process.cmdexec('epstopdf "%s"' % eps)
 
 def dvi2eps(dvi, dest=None):
     if dest is None:
         dest = eps.new(ext=".eps")
-    command = 'dvips -q -E -n 1 -D 600 -p 1 -o %s %s' % (dest, dvi)
+    command = 'dvips -q -E -n 1 -D 600 -p 1 -o "%s" "%s"' % (dest, dvi)
     if not py.path.local.sysfind("dvips"):
         raise SystemExit("ERROR: dvips not found")
     py.process.cmdexec(command)
@@ -52,7 +52,7 @@
     result = fn.new(ext=new_extension)
     print result
     arg = "-T%s" % (format_to_dotargument[new_extension], )
-    py.std.os.system("dot %s %s > %s" % (arg, fn, result))
+    py.std.os.system('dot "%s" "%s" > "%s"' % (arg, fn, result))
     if new_extension == "eps":
         ps = result.new(ext="ps")
         result.move(ps)
@@ -115,7 +115,7 @@
     def gen_dvi(self):
         origdir = py.path.local()
         self.temp.chdir()
-        py.process.cmdexec('latex %s' % (self.latex))
+        py.process.cmdexec('latex "%s"' % (self.latex))
         origdir.chdir()
 
     def gen_png(self):
@@ -148,7 +148,9 @@
         sx = int((x2 - x1) * self.scale * self.upscale)
         sy = int((y2 - y1) * self.scale * self.upscale)
         res = 72 * self.scale * self.upscale
-        command = 'gs -q -g%dx%d -r%dx%d -sDEVICE=%s -sOutputFile=%s -dNOPAUSE -dBATCH %s' % (sx, sy, res, res, self.output_format, self.png, ps)
+        command = ('gs -q -g%dx%d -r%dx%d -sDEVICE=%s -sOutputFile="%s" '
+                   '-dNOPAUSE -dBATCH "%s"') % (
+                    sx, sy, res, res, self.output_format, self.png, ps)
         py.process.cmdexec(command)
 
     def scale_image(self):