8000 Merge pull request #12484 from meeseeksmachine/auto-backport-of-pr-12… · matplotlib/matplotlib@5415c55 · GitHub
[go: up one dir, main page]

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5415c55

Browse files
authored
Merge pull request #12484 from meeseeksmachine/auto-backport-of-pr-12448-on-v3.0.x
Backport PR #12448 on branch v3.0.x (Don't error if some font directories are not readable.)
2 parents e70895b + 98e6492 commit 5415c55

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

lib/matplotlib/font_manager.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,11 @@ def list_fonts(directory, extensions):
152152
recursively under the directory.
153153
"""
154154
extensions = ["." + ext for ext in extensions]
155-
return [str(path)
156-
for path in filter(Path.is_file, Path(directory).glob("**/*.*"))
157-
if path.suffix.lower() in extensions]
155+
return [os.path.join(dirpath, filename)
156+
# os.walk ignores access errors, unlike Path.glob.
157+
for dirpath, _, filenames in os.walk(directory)
158+
for filename in filenames
159+
if Path(filename).suffix.lower() in extensions]
158160

159161

160162
def win32FontDirectory():

0 commit comments

Comments
 (0)
0