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

timhoffm · web-flow · commit f87f4be29eb1 · 2019-12-17T21:51:00.000+01:00
Backport PR #15937 on branch v3.2.x (Don't hide exceptions in FontManager.addfont.)
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -987,7 +987,13 @@ def __init__(self, size=None, weight='normal'):
         for fontext in ["afm", "ttf"]:
             for path in [*findSystemFonts(paths, fontext=fontext),
                          *findSystemFonts(fontext=fontext)]:
-                self.addfont(path)
+                try:
+                    self.addfont(path)
+                except OSError as exc:
+                    _log.info("Failed to open font file %s: %s", path, exc)
+                except Exception as exc:
+                    _log.info("Failed to extract font properties from %s: %s",
+                              path, exc)
 
     def addfont(self, path):
         """
@@ -999,36 +1005,13 @@ def addfont(self, path):
         path : str or path-like
         """
         if Path(path).suffix.lower() == ".afm":
-            try:
-                with open(path, "rb") as fh:
-                    font = afm.AFM(fh)
-            except EnvironmentError:
-                _log.info("Could not open font file %s", path)
-                return
-            except RuntimeError:
-                _log.info("Could not parse font file %s", path)
-                return
-            try:
-                prop = afmFontProperty(path, font)
-            except KeyError as exc:
-                _log.info("Could not extract properties for %s: %s", path, exc)
-                return
+            with open(path, "rb") as fh:
+                font = afm.AFM(fh)
+            prop = afmFontProperty(path, font)
             self.afmlist.append(prop)
         else:
-            try:
-                font = ft2font.FT2Font(path)
-            except (OSError, RuntimeError) as exc:
-                _log.info("Could not open font file %s: %s", path, exc)
-                return
-            except UnicodeError:
-                _log.info("Cannot handle unicode filenames")
-                return
-            try:
-                prop = ttfFontProperty(font)
-            except (KeyError, RuntimeError, ValueError,
-                    NotImplementedError) as exc:
-                _log.info("Could not extract properties for %s: %s", path, exc)
-                return
+            font = ft2font.FT2Font(path)
+            prop = ttfFontProperty(font)
             self.ttflist.append(prop)
 
     @property
