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

Fix filename decoding when calling fc-match #1921

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
Apr 18, 2013
Merged

Fix filename decoding when calling fc-match #1921

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
Fixes #1879: Properly decode filenames that we get from fc-match
  • Loading branch information
@mdboom
mdboom committed Apr 18, 2013
commit 2415c6200ebdba75a0571d71a4569f18153fff57
3 changes: 2 additions & 1 deletion 3 lib/matplotlib/font_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,11 +1289,12 @@ def fc_match(pattern, fontext):
if pipe.returncode == 0:
for match in _fc_match_regex.finditer(output):
file = match.group(1)
file = file.decode(sys.getfilesystemencoding())
if os.path.splitext(file)[1][1:] in fontexts:
return file
return None

_fc_match_regex = re.compile(r'\sfile:\s+"([^"]*)"')
_fc_match_regex = re.compile(rb'\sfile:\s+"([^"]*)"')
_fc_match_cache = {}

def findfont(prop, fontext='ttf'):
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.