Merge pull request #2469 from cgohlke/patch-2

mdboom · mdboom · commit 748f79994e03 · 2013-09-30T07:20:25.000-07:00
BUG: gswin64c.exe not detected on Windows
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -339,23 +339,22 @@ def checkdep_dvipng():
         return None
 
 def checkdep_ghostscript():
-    try:
-        if sys.platform == 'win32':
-            gs_execs = ['gswin32c', 'gswin64c', 'gs']
-        else:
-            gs_execs = ['gs']
-        for gs_exec in gs_execs:
+    if sys.platform == 'win32':
+        gs_execs = ['gswin32c', 'gswin64c', 'gs']
+    else:
+        gs_execs = ['gs']
+    for gs_exec in gs_execs:
+        try:
             s = subprocess.Popen(
                 [gs_exec, '--version'], stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE)
             stdout, stderr = s.communicate()
             if s.returncode == 0:
                 v = byte2str(stdout[:-1])
                 return gs_exec, v
-
-        return None, None
-    except (IndexError, ValueError, OSError):
-        return None, None
+        except (IndexError, ValueError, OSError):
+            pass
+    return None, None
 
 def checkdep_tex():
     try:
