refactor: python layer cleanup

aitikgupta · tacaswell · commit 9e3809fbe18d · 2022-02-18T17:38:46.000-05:00
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -37,7 +37,7 @@
 from matplotlib.backend_bases import (
     _Backend, FigureCanvasBase, FigureManagerBase,
     RendererBase)
-from matplotlib.font_manager import find_fontsprop, get_font
+from matplotlib.font_manager import find_fonts_by_props, get_font
 from matplotlib.ft2font import (LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING,
                                 LOAD_DEFAULT, LOAD_NO_AUTOHINT)
 from matplotlib.mathtext import MathTextParser
@@ -293,7 +293,7 @@ def _prepare_font(self, font_prop):
         """
         Get the `.FT2Font` for *font_prop*, clear its buffer, and set its size.
         """
-        fname = find_fontsprop(font_prop)
+        fname = find_fonts_by_props(font_prop)
         font = get_font(fname)
 
         font.clear()
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -1335,8 +1335,8 @@ def get_font_names(self):
         """Return the list of available fonts."""
         return list(set([font.name for font in self.ttflist]))
 
-    def find_fontsprop(self, prop, fontext='ttf', directory=None,
-                       fallback_to_default=True, rebuild_if_missing=True):
+    def find_fonts_by_props(self, prop, fontext='ttf', directory=None,
+                            fallback_to_default=True, rebuild_if_missing=True):
         """
         Find font families that most closely matches the given properties.
 
@@ -1387,29 +1387,29 @@ def find_fontsprop(self, prop, fontext='ttf', directory=None,
             "font.monospace"])
 
         prop = FontProperties._from_any(prop)
-        ffamily = prop.get_family()
 
         fpaths = OrderedDict()
-        for fidx in range(len(ffamily)):
+        for family in prop.get_family():
             cprop = prop.copy()
 
             # set current prop's family
-            cprop.set_family(ffamily[fidx])
+            cprop.set_family(family)
 
             # do not fall back to default font
             fpath = self._findfontsprop_cached(
-                ffamily[fidx], cprop, fontext, directory,
+                family, cprop, fontext, directory,
                 False, rebuild_if_missing, rc_params
             )
             if fpath:
-                fpaths[ffamily[fidx]] = fpath
+                fpaths[family] = fpath
 
         # only add default family if no other font was found
         # and fallback_to_default is enabled
         if not fpaths:
             if fallback_to_default:
                 dfamily = self.defaultFamily[fontext]
-                cprop = prop.copy().set_family(dfamily)
+                cprop = prop.copy()
+                cprop.set_family(dfamily)
                 fpath = self._findfontsprop_cached(
                     dfamily, cprop, fontext, directory,
                     True, rebuild_if_missing, rc_params
@@ -1539,20 +1539,17 @@ def is_opentype_cff_font(filename):
 
 @lru_cache(64)
 def _get_font(fpaths, hinting_factor, *, _kerning_factor, thread_id):
-    ftobjects = []
-    for fpath in fpaths[1:]:
-        ftobject = ft2font.FT2Font(
-            fpath, hinting_factor,
-            _kerning_factor=_kerning_factor
-        )
-        ftobjects.append(ftobject)
-
-    ft2font_object = ft2font.FT2Font(
+    return ft2font.FT2Font(
         fpaths[0], hinting_factor,
-        _fallback_list=ftobjects,
+        _fallback_list=[
+            ft2font.FT2Font(
+                fpath, hinting_factor,
+                _kerning_factor=_kerning_factor
+            )
+            for fpath in fpaths[1:]
+        ],
         _kerning_factor=_kerning_factor
     )
-    return ft2font_object
 
 
 # FT2Font objects cannot be used across fork()s because they reference the same
@@ -1600,4 +1597,4 @@ def _load_fontmanager(*, try_read_cache=True):
 fontManager = _load_fontmanager()
 findfont = fontManager.findfont
 get_font_names = fontManager.get_font_names
-find_fontsprop = fontManager.find_fontsprop
+find_fonts_by_props = fontManager.find_fonts_by_props
