Merge pull request #22042 from anntzer/fep

timhoffm · web-flow · commit 62a299ff7ada · 2021-12-23T16:00:45.000+01:00
Keep FontEntry helpers private.
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -382,7 +382,7 @@ def findSystemFonts(fontpaths=None, fontext='ttf'):
     return [fname for fname in fontfiles if os.path.exists(fname)]
 
 
-def fontentry_helper_repr_png_(fontent):
+def _fontentry_helper_repr_png(fontent):
     from matplotlib.figure import Figure  # Circular import.
     fig = Figure()
     font_path = Path(fontent.fname) if fontent.fname != '' else None
@@ -392,8 +392,8 @@ def fontentry_helper_repr_png_(fontent):
         return buf.getvalue()
 
 
-def fontentry_helper_repr_html_(fontent):
-    png_stream = fontentry_helper_repr_png_(fontent)
+def _fontentry_helper_repr_html(fontent):
+    png_stream = _fontentry_helper_repr_png(fontent)
     png_b64 = b64encode(png_stream).decode()
     return f"<img src=\"data:image/png;base64, {png_b64}\" />"
 
@@ -414,8 +414,8 @@ def fontentry_helper_repr_html_(fontent):
 
     It is used when populating the font lookup dictionary.
     """,
-        '_repr_html_': lambda self: fontentry_helper_repr_html_(self),
-        '_repr_png_': lambda self: fontentry_helper_repr_png_(self),
+        '_repr_html_': lambda self: _fontentry_helper_repr_html(self),
+        '_repr_png_': lambda self: _fontentry_helper_repr_png(self),
     }
 )
 
