From ac9bf14cfd7a2198f5a5eaa07ebf278691c13d51 Mon Sep 17 00:00:00 2001 From: Alistair Muldal Date: Sat, 11 Jan 2014 16:52:42 +0000 Subject: [PATCH 1/3] ENH: Look for styles in ~/.config/matplotlib/stylelib for XDG compliance --- lib/matplotlib/style/core.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py index 845d5472b294..22611834ea59 100644 --- a/lib/matplotlib/style/core.py +++ b/lib/matplotlib/style/core.py @@ -30,7 +30,8 @@ _here = os.path.abspath(os.path.dirname(__file__)) BASE_LIBRARY_PATH = os.path.join(_here, 'stylelib') # Users may want multiple library paths, so store a list of paths. -USER_LIBRARY_PATHS = [os.path.join('~', '.matplotlib', 'stylelib')] +USER_LIBRARY_PATHS = [os.path.join('~', '.matplotlib', 'stylelib'), + os.path.join('~', '.config', 'matplotlib', 'stylelib')] STYLE_EXTENSION = 'mplstyle' STYLE_FILE_PATTERN = re.compile('([\S]+).%s$' % STYLE_EXTENSION) From 501b90768e70d47cc787f23bcccb1d8643c978fb Mon Sep 17 00:00:00 2001 From: Alistair Muldal Date: Mon, 13 Jan 2014 09:11:44 +0000 Subject: [PATCH 2/3] PEP8 removed trailing whitespace --- lib/matplotlib/style/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py index 22611834ea59..efb78b038b7d 100644 --- a/lib/matplotlib/style/core.py +++ b/lib/matplotlib/style/core.py @@ -30,7 +30,7 @@ _here = os.path.abspath(os.path.dirname(__file__)) BASE_LIBRARY_PATH = os.path.join(_here, 'stylelib') # Users may want multiple library paths, so store a list of paths. -USER_LIBRARY_PATHS = [os.path.join('~', '.matplotlib', 'stylelib'), +USER_LIBRARY_PATHS = [os.path.join('~', '.matplotlib', 'stylelib'), os.path.join('~', '.config', 'matplotlib', 'stylelib')] STYLE_EXTENSION = 'mplstyle' STYLE_FILE_PATTERN = re.compile('([\S]+).%s$' % STYLE_EXTENSION) From 333591d6804cb4d04b53889b3513c91cad1b38ec Mon Sep 17 00:00:00 2001 From: Alistair Muldal Date: Mon, 13 Jan 2014 11:24:36 +0000 Subject: [PATCH 3/3] use matplotlib._get_configdir() rather than manually setting path to config dir --- lib/matplotlib/style/core.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py index efb78b038b7d..02efe1f8a691 100644 --- a/lib/matplotlib/style/core.py +++ b/lib/matplotlib/style/core.py @@ -30,8 +30,7 @@ _here = os.path.abspath(os.path.dirname(__file__)) BASE_LIBRARY_PATH = os.path.join(_here, 'stylelib') # Users may want multiple library paths, so store a list of paths. -USER_LIBRARY_PATHS = [os.path.join('~', '.matplotlib', 'stylelib'), - os.path.join('~', '.config', 'matplotlib', 'stylelib')] +USER_LIBRARY_PATHS = [os.path.join(mpl._get_configdir(), 'stylelib')] STYLE_EXTENSION = 'mplstyle' STYLE_FILE_PATTERN = re.compile('([\S]+).%s$' % STYLE_EXTENSION)