Skip to content

Backport PR #12213 on branch v3.0.x (Change win32InstalledFonts return value) #12230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2018
Merged

Backport PR #12213 on branch v3.0.x (Change win32InstalledFonts return value) #12230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions doc/api/next_api_changes/2018-09-22-TH-win32InstalledFonts.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
matplotlib.font_manager.win32InstalledFonts return value
````````````````````````````````````````````````````````

`matplotlib.font_manager.win32InstalledFonts` returns an empty list instead
of None if no fonts are found.
4 changes: 1 addition & 3 deletions lib/matplotlib/font_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ def win32InstalledFonts(directory=None, fontext='ttf'):
filenames are returned by default, or AFM fonts if *fontext* ==
'afm'.
"""

import winreg

if directory is None:
Expand All @@ -203,10 +202,9 @@ def win32InstalledFonts(directory=None, fontext='ttf'):
path = Path(directory, direc).resolve()
if path.suffix.lower() in fontext:
items.add(str(path))
return list(items)
except (OSError, MemoryError):
continue
return None
return list(items)


def OSXInstalledFonts(directories=None, fontext='ttf'):
Expand Down