|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
704b8e1 |
From c006ef7296abee22c3ec4ae1f3ee79bfa903471f Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
Date: Wed, 27 Sep 2017 19:35:59 -0400
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
704b8e1 |
Subject: [PATCH 1/5] matplotlibrc path search fix
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
---
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
ca0fc90 |
lib/matplotlib/__init__.py | 5 ++++-
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
ca0fc90 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
704b8e1 |
index 50033b212a..8639a44283 100644
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
--- a/lib/matplotlib/__init__.py
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
+++ b/lib/matplotlib/__init__.py
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
704b8e1 |
@@ -540,7 +540,8 @@ def get_cachedir():
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
ca0fc90 |
@_logged_cached('matplotlib data path: %s')
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
ca0fc90 |
def get_data_path():
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
ca0fc90 |
"""Return the path to Matplotlib data."""
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
ca0fc90 |
- return str(Path(__file__).with_name("mpl-data"))
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
58b78d7 |
+ return str(Path(__file__).parent.parent.parent.parent.parent /
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
58b78d7 |
+ 'share/matplotlib/mpl-data')
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
e6f3591 |
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
1dcb7af |
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
ca0fc90 |
def matplotlib_fname():
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
704b8e1 |
@@ -560,6 +561,7 @@ def matplotlib_fname():
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
9046bbb |
is not defined)
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
9046bbb |
- On other platforms,
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
e6f3591 |
- ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
037e6ae |
+ - ``/etc/matplotlibrc``
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
037e6ae |
- Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
037e6ae |
exist.
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
b11ac26 |
"""
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
704b8e1 |
@@ -578,6 +580,7 @@ def matplotlib_fname():
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
5ff9cbe |
yield matplotlibrc
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
5ff9cbe |
yield os.path.join(matplotlibrc, 'matplotlibrc')
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
1dcb7af |
yield os.path.join(get_configdir(), 'matplotlibrc')
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
5ff9cbe |
+ yield '/etc/matplotlibrc'
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
ca0fc90 |
yield os.path.join(get_data_path(), 'matplotlibrc')
|
|
![](https://seccdn.libravatar.org/avatar/57786a34137b991d3b102d8539cac83d8b87da06d82934a1bc7029f80f9fb0be?s=16&d=retro) |
12e8a62 |
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
5ff9cbe |
for fname in gen_candidates():
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
--
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
14bebd4 |
2.36.1
|
|
![](https://seccdn.libravatar.org/avatar/0b0f63847357759267a3623f6904da34d6c98fb16d6f26d5b1a6ac8c2e5c6b3a?s=16&d=retro) |
c9345fa |
|