From e89ad40122db9e9eebe23fd2808d29ca55a1e071 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 16 Jan 2017 16:22:49 -0500 Subject: [PATCH 1/3] Remove redundant OrderedDict call. --- lib/matplotlib/_color_data.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/_color_data.py b/lib/matplotlib/_color_data.py index 7c47eca30378..774e251d72bd 100644 --- a/lib/matplotlib/_color_data.py +++ b/lib/matplotlib/_color_data.py @@ -16,7 +16,7 @@ # These colors are from Tableau -TABLEAU_COLORS = OrderedDict(( +TABLEAU_COLORS = ( ('blue', '#1f77b4'), ('orange', '#ff7f0e'), ('green', '#2ca02c'), @@ -26,12 +26,12 @@ ('pink', '#e377c2'), ('gray', '#7f7f7f'), ('olive', '#bcbd22'), - ('cyan', '#17becf')) + ('cyan', '#17becf'), ) # Normalize name to "tab:" to avoid name collisions. TABLEAU_COLORS = OrderedDict( - ('tab:' + name, value) for name, value in TABLEAU_COLORS.items()) + ('tab:' + name, value) for name, value in TABLEAU_COLORS) # This mapping of color names -> hex values is taken from # a survey run by Randel Monroe see: From 6b13c0bc1c28f4b94d0724419358697c354885cf Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 16 Jan 2017 16:31:36 -0500 Subject: [PATCH 2/3] Fix one last tc -> tab. --- lib/matplotlib/colors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py index 179a4bef2597..1502844f13c4 100644 --- a/lib/matplotlib/colors.py +++ b/lib/matplotlib/colors.py @@ -260,7 +260,7 @@ def to_hex(c, keep_alpha=False): ### Backwards-compatible color-conversion API cnames = CSS4_COLORS -COLOR_NAMES = {'xkcd': XKCD_COLORS, 'css4': CSS4_COLORS, 'tc': TABLEAU_COLORS} +COLOR_NAMES = {'xkcd': XKCD_COLORS, 'css4': CSS4_COLORS, 'tab': TABLEAU_COLORS} hexColorPattern = re.compile("\A#[a-fA-F0-9]{6}\Z") From 3d3130a294cb91a29c519923689c42b5fcec9b10 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 16 Jan 2017 18:01:27 -0500 Subject: [PATCH 3/3] MNT: remove un-used public dictionary This dictionary was added in #5775 sha: 9655f45 (and not yet released) and was removed from internal use by #6382 sha: (master) 22a7b95 / (2.x backport) 3281bcd --- lib/matplotlib/colors.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py index 1502844f13c4..f665b134df62 100644 --- a/lib/matplotlib/colors.py +++ b/lib/matplotlib/colors.py @@ -260,7 +260,6 @@ def to_hex(c, keep_alpha=False): ### Backwards-compatible color-conversion API cnames = CSS4_COLORS -COLOR_NAMES = {'xkcd': XKCD_COLORS, 'css4': CSS4_COLORS, 'tab': TABLEAU_COLORS} hexColorPattern = re.compile("\A#[a-fA-F0-9]{6}\Z") pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy