From 9776757607af144c824d72920f8983efc35face3 Mon Sep 17 00:00:00 2001

From: Elliott Sales de Andrade <quantum.analyst@gmail.com>

Date: Wed, 27 Sep 2017 19:35:59 -0400

Subject: [PATCH 1/4] matplotlibrc path search fix

Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>

---

 lib/matplotlib/__init__.py            | 19 ++++---------------

 lib/matplotlib/tests/test_rcparams.py | 18 ++++++++++++------

 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py

index 825303171..7a4115491 100644

--- a/lib/matplotlib/__init__.py

+++ b/lib/matplotlib/__init__.py

@@ -624,18 +624,8 @@ def _get_data_path():

         return path

     def get_candidate_paths():

-        yield Path(__file__).with_name('mpl-data')

-        # setuptools' namespace_packages may hijack this init file

-        # so need to try something known to be in Matplotlib, not basemap.

-        import matplotlib.afm

-        yield Path(matplotlib.afm.__file__).with_name('mpl-data')

-        # py2exe zips pure python, so still need special check.

-        if getattr(sys, 'frozen', None):

-            yield Path(sys.executable).with_name('mpl-data')

-            # Try again assuming we need to step up one more directory.

-            yield Path(sys.executable).parent.with_name('mpl-data')

-            # Try again assuming sys.path[0] is a dir not a exe.

-            yield Path(sys.path[0]) / 'mpl-data'

+        yield (Path(__file__).parent.parent.parent.parent.parent /

+               'share/matplotlib/mpl-data')

     for path in get_candidate_paths():

         if path.is_dir():

@@ -678,8 +668,7 @@ def matplotlib_fname():

           is not defined)

     - On other platforms,

         - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined

-    - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always

-      exist.

+    - Lastly, it looks in ``/etc/matplotlibrc``, which should always exist.

     """

     def gen_candidates():

@@ -692,7 +681,7 @@ def matplotlib_fname():

             yield matplotlibrc

             yield os.path.join(matplotlibrc, 'matplotlibrc')

         yield os.path.join(get_configdir(), 'matplotlibrc')

-        yield os.path.join(get_data_path(), 'matplotlibrc')

+        yield '/etc/matplotlibrc'

     for fname in gen_candidates():

         if os.path.exists(fname) and not os.path.isdir(fname):

diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py

index d8fe73ceb..c3aeb58ef 100644

--- a/lib/matplotlib/tests/test_rcparams.py

+++ b/lib/matplotlib/tests/test_rcparams.py

@@ -1,6 +1,7 @@

 from collections import OrderedDict

 import copy

 import os

+from pathlib import Path

 from unittest import mock

 import warnings

@@ -457,11 +458,17 @@ def test_rcparams_reset_after_fail():

         assert mpl.rcParams['text.usetex'] is False

-def test_if_rctemplate_is_up_to_date():

+@pytest.fixture

+def mplrc():

+    # This is the Fedora-specific location.

+    return (Path(__file__).parent.parent.parent.parent.parent.parent.parent /

+            'etc/matplotlibrc')

+

+

+def test_if_rctemplate_is_up_to_date(mplrc):

     # This tests if the matplotlibrc.template file contains all valid rcParams.

     deprecated = {*mpl._all_deprecated, *mpl._deprecated_remain_as_none}

-    path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')

-    with open(path_to_rc, "r") as f:

+    with open(mplrc, "r") as f:

         rclines = f.readlines()

     missing = {}

     for k, v in mpl.defaultParams.items():

@@ -484,11 +491,10 @@ def test_if_rctemplate_is_up_to_date():

                          .format(missing.items()))

-def test_if_rctemplate_would_be_valid(tmpdir):

+def test_if_rctemplate_would_be_valid(tmpdir, mplrc):

     # This tests if the matplotlibrc.template file would result in a valid

     # rc file if all lines are uncommented.

-    path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')

-    with open(path_to_rc, "r") as f:

+    with open(mplrc, "r") as f:

         rclines = f.readlines()

     newlines = []

     for line in rclines:

-- 

2.21.1