Merge pull request #15673 from anntzer/unfindfont

dstansby · web-flow · commit 49d111cbca9f · 2019-11-22T10:32:26.000Z
Rely on findfont autofallback-to-default in pdf/ps backends.
diff --git a/lib/matplotlib/backends/_backend_pdf_ps.py b/lib/matplotlib/backends/_backend_pdf_ps.py
@@ -69,11 +69,8 @@ def get_text_width_height_descent(self, s, prop, ismath):
             return w, h, d
 
     def _get_font_afm(self, prop):
-        fname = (
-            font_manager.findfont(
-                prop, fontext="afm", directory=self._afm_font_dir)
-            or font_manager.findfont(
-                "Helvetica", fontext="afm", directory=self._afm_font_dir))
+        fname = font_manager.findfont(
+            prop, fontext="afm", directory=self._afm_font_dir)
         return _cached_get_afm_from_fname(fname)
 
     def _get_font_ttf(self, prop):
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -661,10 +661,6 @@ def fontName(self, fontprop):
         elif rcParams['pdf.use14corefonts']:
             filename = findfont(
                 fontprop, fontext='afm', directory=RendererPdf._afm_font_dir)
-            if filename is None:
-                filename = findfont(
-                    "Helvetica",
-                    fontext='afm', directory=RendererPdf._afm_font_dir)
         else:
             filename = findfont(fontprop)
 
