Merge pull request #12219 from anntzer/osxinstalledfonts

jklymak · web-flow · commit 8d66b47dff4a · 2018-09-24T11:56:03.000-07:00
Merge OSXInstalledFonts into findSystemFonts.
diff --git a/doc/api/next_api_changes/2018-08-17-AL-deprecations.rst b/doc/api/next_api_changes/2018-08-17-AL-deprecations.rst
@@ -6,4 +6,5 @@ The following API elements are deprecated:
 - ``get_py2exe_datafiles``, ``tk_window_focus``,
 - ``backend_ps.PsBackendHelper``, ``backend_ps.ps_backend_helper``,
 - ``cbook.iterable``,
+- ``font_manager.OSXInstalledFonts``,
 - ``mlab.demean``,
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -207,6 +207,7 @@ def win32InstalledFonts(directory=None, fontext='ttf'):
     return list(items)
 
 
+@cbook.deprecated("3.1")
 def OSXInstalledFonts(directories=None, fontext='ttf'):
     """Get list of font files on OS X."""
     if directories is None:
@@ -261,10 +262,9 @@ def findSystemFonts(fontpaths=None, fontext='ttf'):
             fontfiles.update(win32InstalledFonts(fontext=fontext))
         else:
             fontpaths = X11FontDirectories
-            fontfiles.update(get_fontconfig_fonts(fontext))
-            # check for OS X & load its fonts if present
             if sys.platform == 'darwin':
-                fontfiles.update(OSXInstalledFonts(fontext=fontext))
+                fontpaths = [*X11FontDirectories, *OSXFontDirectories]
+            fontfiles.update(get_fontconfig_fonts(fontext))
 
     elif isinstance(fontpaths, str):
         fontpaths = [fontpaths]
