Merge pull request #2154 from torcolvin/master

mdboom · mdboom · commit 7b5367562467 · 2013-06-29T13:04:22.000-07:00
catch fontconfig errors on OS X
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -273,7 +273,7 @@ def get_fontconfig_fonts(fontext='ttf'):
     try:
         pipe = subprocess.Popen(['fc-list', '', 'file'], stdout=subprocess.PIPE)
         output = pipe.communicate()[0]
-    except OSError:
+    except OSError, IOError:
         # Calling fc-list did not work, so we'll just return nothing
         return fontfiles
 
@@ -1296,7 +1296,7 @@ def fc_match(pattern, fontext):
         try:
             pipe = subprocess.Popen(['fc-match', '-sv', pattern], stdout=subprocess.PIPE)
             output = pipe.communicate()[0]
-        except OSError:
+        except OSError, IOError:
             return None
         if pipe.returncode == 0:
             for match in _fc_match_regex.finditer(output):
