Merge pull request #7907 from jkseppan/fc-list-format

tacaswell · web-flow · commit 0384b857b557 · 2017-01-23T00:11:30.000-05:00
BUG: Add a newline separator in fc-list call
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -281,7 +281,7 @@ def _call_fc_list():
         'This may take a moment.'))
     timer.start()
     try:
-        out = subprocess.check_output([str('fc-list'), '--format=%{file}'])
+        out = subprocess.check_output([str('fc-list'), '--format=%{file}\\n'])
     except (OSError, subprocess.CalledProcessError):
         return []
     finally:
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -5,17 +5,15 @@
 import six
 
 import os
-
+import sys
 import tempfile
 import warnings
 
 from matplotlib.font_manager import (
     findfont, FontProperties, fontManager, json_dump, json_load, get_font,
-    is_opentype_cff_font, fontManager as fm)
-import os.path
-
-
+    get_fontconfig_fonts, is_opentype_cff_font, fontManager as fm)
 from matplotlib import rc_context
+from matplotlib.testing.decorators import skipif
 
 
 def test_font_priority():
@@ -65,3 +63,8 @@ def test_otf():
         with open(f, 'rb') as fd:
             res = fd.read(4) == b'OTTO'
         assert res == is_opentype_cff_font(f)
+
+
+@skipif(sys.platform == 'win32', reason='no fontconfig on Windows')
+def test_get_fontconfig_fonts():
+    assert len(get_fontconfig_fonts()) > 1
