120 lines
4.4 KiB
Diff
120 lines
4.4 KiB
Diff
From 3c225cf3905d734a27df25e3a53a904a55f2904e Mon Sep 17 00:00:00 2001
|
|
From: Sandro Tosi <morph@debian.org>
|
|
Date: Wed, 27 Sep 2017 19:35:59 -0400
|
|
Subject: [PATCH 1/5] matplotlibrc path search fix
|
|
|
|
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
---
|
|
lib/matplotlib/__init__.py | 5 ++++-
|
|
lib/matplotlib/backend_tools.py | 16 ++++++++--------
|
|
2 files changed, 12 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
|
index 2786f9b7b9..64ba02afd6 100644
|
|
--- a/lib/matplotlib/__init__.py
|
|
+++ b/lib/matplotlib/__init__.py
|
|
@@ -593,7 +593,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 str(Path(__file__).parent.parent.parent.parent.parent /
|
|
+ 'share/matplotlib/mpl-data')
|
|
|
|
|
|
def matplotlib_fname():
|
|
@@ -613,6 +614,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.
|
|
"""
|
|
@@ -631,6 +633,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():
|
|
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
|
|
index 87ed794022..9d80539114 100644
|
|
--- a/lib/matplotlib/backend_tools.py
|
|
+++ b/lib/matplotlib/backend_tools.py
|
|
@@ -596,7 +596,7 @@ class ToolHome(ViewsPositionsBase):
|
|
"""Restore the original view limits."""
|
|
|
|
description = 'Reset original view'
|
|
- image = 'mpl-data/images/home'
|
|
+ image = '/usr/share/matplotlib/mpl-data/images/home'
|
|
default_keymap = property(lambda self: mpl.rcParams['keymap.home'])
|
|
_on_trigger = 'home'
|
|
|
|
@@ -605,7 +605,7 @@ class ToolBack(ViewsPositionsBase):
|
|
"""Move back up the view limits stack."""
|
|
|
|
description = 'Back to previous view'
|
|
- image = 'mpl-data/images/back'
|
|
+ image = '/usr/share/matplotlib/mpl-data/images/back'
|
|
default_keymap = property(lambda self: mpl.rcParams['keymap.back'])
|
|
_on_trigger = 'back'
|
|
|
|
@@ -614,7 +614,7 @@ class ToolForward(ViewsPositionsBase):
|
|
"""Move forward in the view lim stack."""
|
|
|
|
description = 'Forward to next view'
|
|
- image = 'mpl-data/images/forward'
|
|
+ image = '/usr/share/matplotlib/mpl-data/images/forward'
|
|
default_keymap = property(lambda self: mpl.rcParams['keymap.forward'])
|
|
_on_trigger = 'forward'
|
|
|
|
@@ -623,14 +623,14 @@ class ConfigureSubplotsBase(ToolBase):
|
|
"""Base tool for the configuration of subplots."""
|
|
|
|
description = 'Configure subplots'
|
|
- image = 'mpl-data/images/subplots'
|
|
+ image = '/usr/share/matplotlib/mpl-data/images/subplots'
|
|
|
|
|
|
class SaveFigureBase(ToolBase):
|
|
"""Base tool for figure saving."""
|
|
|
|
description = 'Save the figure'
|
|
- image = 'mpl-data/images/filesave'
|
|
+ image = '/usr/share/matplotlib/mpl-data/images/filesave'
|
|
default_keymap = property(lambda self: mpl.rcParams['keymap.save'])
|
|
|
|
|
|
@@ -705,7 +705,7 @@ class ToolZoom(ZoomPanBase):
|
|
"""A Tool for zooming using a rectangle selector."""
|
|
|
|
description = 'Zoom to rectangle'
|
|
- image = 'mpl-data/images/zoom_to_rect'
|
|
+ image = '/usr/share/matplotlib/mpl-data/images/zoom_to_rect'
|
|
default_keymap = property(lambda self: mpl.rcParams['keymap.zoom'])
|
|
cursor = cursors.SELECT_REGION
|
|
radio_group = 'default'
|
|
@@ -827,7 +827,7 @@ class ToolPan(ZoomPanBase):
|
|
|
|
default_keymap = property(lambda self: mpl.rcParams['keymap.pan'])
|
|
description = 'Pan axes with left mouse, zoom with right'
|
|
- image = 'mpl-data/images/move'
|
|
+ image = '/usr/share/matplotlib/mpl-data/images/move'
|
|
cursor = cursors.MOVE
|
|
radio_group = 'default'
|
|
|
|
@@ -891,7 +891,7 @@ class ToolPan(ZoomPanBase):
|
|
class ToolHelpBase(ToolBase):
|
|
description = 'Print tool list, shortcuts and description'
|
|
default_keymap = property(lambda self: mpl.rcParams['keymap.help'])
|
|
- image = 'mpl-data/images/help'
|
|
+ image = '/usr/share/matplotlib/mpl-data/images/help'
|
|
|
|
@staticmethod
|
|
def format_shortcut(key_sequence):
|
|
--
|
|
2.52.0
|
|
|