Merge pull request #2441 from torcolvin/master

Catch stderr as well as stdout
matplotlib · Oct 1, 2013 · 0b84819 · 0b84819
2 parents 6a5aa01 + 0b604b3
commit 0b84819
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -269,7 +269,9 @@ def get_fontconfig_fonts(fontext='ttf'):
 
     fontfiles = {}
     try:
-        pipe = subprocess.Popen(['fc-list', '--format=%{file}\\n'], stdout=subprocess.PIPE)
+        pipe = subprocess.Popen(['fc-list', '--format=%{file}\\n'],
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE)
         output = pipe.communicate()[0]
     except (OSError, IOError):
         # Calling fc-list did not work, so we'll just return nothing
@@ -1298,7 +1300,8 @@ def fc_match(pattern, fontext):
         try:
             pipe = subprocess.Popen(
                 ['fc-match', '-s', '--format=%{file}\\n', pattern],
-                stdout=subprocess.PIPE)
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE)
             output = pipe.communicate()[0]
         except (OSError, IOError):
             return None