Skip to content

Don't hide exceptions in FontManager.addfont. #15937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2019
Merged

Don't hide exceptions in FontManager.addfont. #15937

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 12 additions & 29 deletions lib/matplotlib/font_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,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):
"""
Expand All @@ -998,36 +1004,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
Expand Down