Merge pull request #15414 from meeseeksmachine/auto-backport-of-pr-15413-on-v3.2.x

tacaswell · web-flow · commit 2da38321e610 · 2019-10-13T19:00:20.000-04:00
Backport PR #15413 on branch v3.2.x (catch OSError instead of FileNotFoundError in _get_executable_info to resolve #15399)
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -337,8 +337,8 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
                 output = _cpe.output
             else:
                 raise ExecutableNotFoundError(str(_cpe)) from _cpe
-        except FileNotFoundError as _fnf:
-            raise ExecutableNotFoundError(str(_fnf)) from _fnf
+        except OSError as _ose:
+            raise ExecutableNotFoundError(str(_ose)) from _ose
         match = re.search(regex, output)
         if match:
             version = LooseVersion(match.group(1))
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -727,8 +727,9 @@ def bin_path(cls):
     def isAvailable(cls):
         try:
             return super().isAvailable()
-        except mpl.ExecutableNotFoundError:
+        except mpl.ExecutableNotFoundError as _enf:
             # May be raised by get_executable_info.
+            _log.debug('ImageMagick unavailable due to: %s', _enf)
             return False
 
 
