Merge pull request #13804 from meeseeksmachine/auto-backport-of-pr-13766-on-v3.1.x

dstansby · web-flow · commit 4aeef7a66a34 · 2019-03-30T10:02:31.000Z
Backport PR #13766 on branch v3.1.x (Search for fonts in XDG directory as well.)
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -114,6 +114,8 @@
     # common application, not really useful
     "/usr/lib/openoffice/share/fonts/truetype/",
     # user fonts
+    str(Path(os.environ.get('XDG_DATA_HOME',
+                            Path.home() / ".local/share")) / "fonts"),
     str(Path.home() / ".fonts"),
 ]
 
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -12,7 +12,7 @@
 from matplotlib.font_manager import (
     findfont, findSystemFonts, FontProperties, fontManager, json_dump,
     json_load, get_font, get_fontconfig_fonts, is_opentype_cff_font,
-    MSUserFontDirectories)
+    MSUserFontDirectories, _call_fc_list)
 from matplotlib import pyplot as plt, rc_context
 
 has_fclist = shutil.which('fc-list') is not None
@@ -131,7 +131,34 @@ def test_find_ttc():
         fig.savefig(BytesIO(), format="ps")
 
 
-def test_user_fonts():
+@pytest.mark.skipif(sys.platform != 'linux', reason='Linux only')
+def test_user_fonts_linux(tmpdir, monkeypatch):
+    font_test_file = 'mpltest.ttf'
+
+    # Precondition: the test font should not be available
+    fonts = findSystemFonts()
+    if any(font_test_file in font for font in fonts):
+        pytest.skip(f'{font_test_file} already exists in system fonts')
+
+    # Prepare a temporary user font directory
+    user_fonts_dir = tmpdir.join('fonts')
+    user_fonts_dir.ensure(dir=True)
+    shutil.copyfile(Path(__file__).parent / font_test_file,
+                    user_fonts_dir.join(font_test_file))
+
+    with monkeypatch.context() as m:
+        m.setenv('XDG_DATA_HOME', str(tmpdir))
+        _call_fc_list.cache_clear()
+        # Now, the font should be available
+        fonts = findSystemFonts()
+        assert any(font_test_file in font for font in fonts)
+
+    # Make sure the temporary directory is no longer cached.
+    _call_fc_list.cache_clear()
+
+
+@pytest.mark.skipif(sys.platform != 'win32', reason='Windows only')
+def test_user_fonts_win32():
     if not os.environ.get('APPVEYOR', False):
         pytest.xfail('This test does only work on appveyor since user fonts '
                      'are Windows specific and the developer\'s font '
@@ -141,7 +168,8 @@ def test_user_fonts():
 
     # Precondition: the test font should not be available
     fonts = findSystemFonts()
-    assert not any(font_test_file in font for font in fonts)
+    if any(font_test_file in font for font in fonts):
+        pytest.skip(f'{font_test_file} already exists in system fonts')
 
     user_fonts_dir = MSUserFontDirectories[0]
 

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,8 @@`
`114`	`114`	`# common application, not really useful`
`115`	`115`	`"/usr/lib/openoffice/share/fonts/truetype/",`
`116`	`116`	`# user fonts`
	`117`	`+ str(Path(os.environ.get('XDG_DATA_HOME',`
	`118`	`+ Path.home() / ".local/share")) / "fonts"),`
`117`	`119`	`str(Path.home() / ".fonts"),`
`118`	`120`	`]`
`119`	`121`