From 6277ea0c008b02cd2abe017d041b43a35a407c6c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Sep 2017 19:35:59 -0400 Subject: [PATCH 1/7] matplotlibrc path search fix Signed-off-by: Elliott Sales de Andrade --- lib/matplotlib/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 71c68a3d6b..9d795f65f5 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -473,7 +473,8 @@ def get_cachedir(): @_logged_cached('matplotlib data path: %s') def get_data_path(): """Return the path to Matplotlib data.""" - return str(Path(__file__).with_name("mpl-data")) + return (Path(__file__).parent.parent.parent.parent.parent / + 'share/matplotlib/mpl-data') def matplotlib_fname(): @@ -493,6 +494,7 @@ def matplotlib_fname(): is not defined) - On other platforms, - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined + - ``/etc/matplotlibrc`` - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always exist. """ @@ -511,6 +513,7 @@ def matplotlib_fname(): yield matplotlibrc yield os.path.join(matplotlibrc, 'matplotlibrc') yield os.path.join(get_configdir(), 'matplotlibrc') + yield '/etc/matplotlibrc' yield os.path.join(get_data_path(), 'matplotlibrc') for fname in gen_candidates(): -- 2.31.1