Simplify font_manager font enumeration logic. #20126
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Seems to have broken Windows tests and docs. |
QuLogic
reviewed
Apr 30, 2021
3b6aa9d to
094a868
Compare
|
Indeed, fixed. |
The font enumeration logic on Windows was relatively difficult to follow, being split over three different functions (win32FontDirectory, _win32RegistryFonts, and win32InstalledFonts), with variable names that did not clearly indicate whether they are directories (such as MSUserFontDirectories) or registry keys (such as MSFontDirectories). Inline most of the logic to _get_win32_installed_fonts, and also get rid of the extension filtering (both here and in get_fontconfig_fonts), as it can be done once for all at the call site (in `findSystemFonts`); also make the helpers return Paths, for simpler manipulation (we still convert to strs at the end).
QuLogic
reviewed
May 4, 2021
QuLogic
approved these changes
May 4, 2021
jklymak
approved these changes
May 20, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The font enumeration logic on Windows was relatively difficult to
follow, being split over three different functions (win32FontDirectory,
_win32RegistryFonts, and win32InstalledFonts), with variable names that
did not clearly indicate whether they are directories (such as
MSUserFontDirectories) or registry keys (such as MSFontDirectories).
Inline most of the logic to _get_win32_installed_fonts, and also
get rid of the extension filtering (both here and in
get_fontconfig_fonts), as it can be done once for all at the call site
(in
findSystemFonts); also make the helpers return Paths, for simplermanipulation (we still convert to strs at the end).
PR Summary
PR Checklist
pytestpasses).flake8on changed files to check).flake8-docstringsand runflake8 --docstring-convention=all).doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).