Change _get_executable_info() to catch ExecutableNotFoundError

Joshua Taillon · Joshua Taillon · commit 0fc4ad6ce16f · 2020-05-08T14:40:45.000-06:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -331,10 +331,12 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
         raise ExecutableNotFoundError(message)
     elif name == "inkscape":
         try:
-            # use "without-gui" option (only works with inkscape version < 1.0):
-            info = impl(["inkscape", "--without-gui", "-V"], "Inkscape ([^ ]*)")
-        except subprocess.CalledProcessError as _cpe:
-            # for inkscape v > 1.0, --without-gui is not needed:
+            # use headless option first (works with inkscape version < 1.0):
+            info = impl(["inkscape", "--without-gui", "-V"], 
+                        "Inkscape ([^ ]*)")
+        except ExecutableNotFoundError as _e:
+            # if --without-gui is not accepted, we're using Inkscape v > 1.0
+            # so try without the headless option:
             info = impl(["inkscape", "-V"], "Inkscape ([^ ]*)")
         if info and info.version >= "1.0":
             raise ExecutableNotFoundError(
