Merge pull request #1921 from mdboom/fc-match-encoding

mdboom · mdboom · commit 3d6561301fd4 · 2013-04-18T08:24:17.000-07:00
Fix filename decoding when calling fc-match
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'):
