Fixes #1879: Properly decode filenames that we get from fc-match

matplotlib · Apr 18, 2013 · 2415c62 · 2415c62 · pferreir · Apr 18, 2013
1 parent 2920408
commit 2415c62
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -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'):