Merge pull request #12336 from meeseeksmachine/auto-backport-of-pr-12212-on-v3.0.x

dstansby · web-flow · commit 70e7820aef9c · 2018-09-29T10:32:45.000+01:00
Backport PR #12212 on branch v3.0.x (font_manager: Fixed problems with Path(...).suffix)
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -154,7 +154,7 @@ def list_fonts(directory, extensions):
     extensions = ["." + ext for ext in extensions]
     return [str(path)
             for path in filter(Path.is_file, Path(directory).glob("**/*.*"))
-            if path.suffix in extensions]
+            if path.suffix.lower() in extensions]
 
 
 def win32FontDirectory():
@@ -186,7 +186,7 @@ def win32InstalledFonts(directory=None, fontext='ttf'):
     if directory is None:
         directory = win32FontDirectory()
 
-    fontext = get_fontext_synonyms(fontext)
+    fontext = ['.' + ext for ext in get_fontext_synonyms(fontext)]
 
     items = set()
     for fontdir in MSFontDirectories:
@@ -238,9 +238,9 @@ def _call_fc_list():
 def get_fontconfig_fonts(fontext='ttf'):
     """List the font filenames known to `fc-list` having the given extension.
     """
-    fontext = get_fontext_synonyms(fontext)
+    fontext = ['.' + ext for ext in get_fontext_synonyms(fontext)]
     return [fname for fname in _call_fc_list()
-            if Path(fname).suffix[1:] in fontext]
+            if Path(fname).suffix.lower() in fontext]
 
 
 def findSystemFonts(fontpaths=None, fontext='ttf'):
