Use subprocess.Popen instead of os.popen in dviread

jkseppan · jkseppan · commit b03a9089b630 · 2008-12-11T20:32:04.000Z
(Windows problem reported by Jorgen Stenarson)

svn path=/trunk/matplotlib/; revision=6565
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2008-12-11 Use subprocess.Popen instead of os.popen in dviread
+           (Windows problem reported by Jorgen Stenarson) - JKS
+
 2008-12-10 Added Michael's font_manager fix and Jae-Joon's
            figure/subplot fix.  Bumped version number to 0.98.5 - JDH
 
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -21,8 +21,8 @@
 import matplotlib
 import matplotlib.cbook as mpl_cbook
 import numpy as np
-import os
 import struct
+import subprocess
 
 _dvistate = mpl_cbook.Bunch(pre=0, outer=1, inpage=2, post_post=3, finale=4)
 
@@ -742,25 +742,15 @@ def find_tex_file(filename, format=None):
     doesn't use kpathsea, so what do we do? (TODO)
     """
 
-    cmd = 'kpsewhich '
+    cmd = ['kpsewhich']
     if format is not None:
-        assert "'" not in format
-        cmd += "--format='" + format + "' "
-    assert "'" not in filename
-    cmd += "'" + filename + "'"
-
+        cmd += ['--format=' + format]
+    cmd += [filename]
+    
     matplotlib.verbose.report('find_tex_file(%s): %s' \
                                   % (filename,cmd), 'debug')
-    pipe = os.popen(cmd, 'r')
-    result = ""
-    while True:
-        data = _read_nointr(pipe)
-        if data == "":
-            break
-        result += data
-    pipe.close()
-    result = result.rstrip()
-
+    pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+    result = pipe.communicate()[0].rstrip()
     matplotlib.verbose.report('find_tex_file result: %s' % result,
                               'debug')
     return result
