ENH: support both spellings of grey an Tableau&xkcd colors

tacaswell · tacaswell · commit 5942a64ff604 · 2017-01-16T12:37:32.000-05:00
diff --git a/lib/matplotlib/_color_data.py b/lib/matplotlib/_color_data.py
@@ -28,7 +28,6 @@
     'olive': '#bcbd22',
     'cyan': '#17becf'}
 
-
 # Normalize name to "tc:<name>" to avoid name collisions.
 TABLEAU_COLORS = {'tc:' + name: value
                   for name, value in TABLEAU_COLORS.items()}
@@ -992,7 +991,6 @@
     'green': '#15b01a',
     'purple': '#7e1e9c'}
 
-
 # Normalize name to "xkcd:<name>" to avoid name collisions.
 XKCD_COLORS = {'xkcd:' + name: value for name, value in XKCD_COLORS.items()}
 
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -86,8 +86,14 @@ def __delitem__(self, key, value):
 _colors_full_map = {}
 # Set by reverse priority order.
 _colors_full_map.update(XKCD_COLORS)
+_colors_full_map.update({k.replace('grey', 'gray'): v
+                         for k, v in XKCD_COLORS.items()
+                         if 'grey' in k})
 _colors_full_map.update(CSS4_COLORS)
 _colors_full_map.update(TABLEAU_COLORS)
+_colors_full_map.update({k.replace('gray', 'grey'): v
+                         for k, v in TABLEAU_COLORS.items()
+                         if 'gray' in k})
 _colors_full_map.update(BASE_COLORS)
 _colors_full_map = _ColorMapping(_colors_full_map)
 
