Merge pull request #13681 from meeseeksmachine/auto-backport-of-pr-13678-on-v3.1.x

timhoffm · web-flow · commit c28acaee5bd4 · 2019-03-17T08:38:06.000+01:00
Backport PR #13678 on branch v3.1.x (Fix font deduplication logic in createFontList.)
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -517,8 +517,6 @@ def createFontList(fontfiles, fontext='ttf'):
         fname = os.path.split(fpath)[1]
         if fname in seen:
             continue
-        else:
-            seen.add(fname)
         if fontext == 'afm':
             try:
                 with open(fpath, 'rb') as fh:
@@ -551,6 +549,7 @@ def createFontList(fontfiles, fontext='ttf'):
                 continue
 
         fontlist.append(prop)
+        seen.add(fname)
     return fontlist
 
 
