Base colors are not special.

anntzer · anntzer · commit 080ed755338f · 2016-05-09T07:35:15.000-07:00
diff --git a/examples/color/named_colors.py b/examples/color/named_colors.py
@@ -14,7 +14,7 @@
 from matplotlib import colors as mcolors
 
 
-colors = mcolors.CSS4_COLORS
+colors = dict(mcolors.BASE_COLORS, **mcolors.CSS4_COLORS)
 
 # Sort by hue, saturation, value and name.
 by_hsv = sorted((tuple(mcolors.rgb_to_hsv(mcolors.to_rgba(color)[:3])), name)
diff --git a/lib/matplotlib/_color_data.py b/lib/matplotlib/_color_data.py
@@ -3,6 +3,18 @@
 
 from matplotlib.externals import six
 
+
+BASE_COLORS = {
+    'b': (0, 0, 1),
+    'g': (0, 0.5, 0),
+    'r': (1, 0, 0),
+    'c': (0, 0.75, 0.75),
+    'm': (0.75, 0, 0.75),
+    'y': (0.75, 0.75, 0),
+    'k': (0, 0, 0),
+    'w': (1, 1, 1)}
+
+
 # This mapping of color names -> hex values is taken from
 # a survey run by Randel Monroe see:
 # http://blog.xkcd.com/2010/05/03/color-survey-results/
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -65,13 +65,13 @@
 import numpy as np
 from numpy import ma
 import matplotlib.cbook as cbook
-from ._color_data import XKCD_COLORS, CSS4_COLORS
+from ._color_data import BASE_COLORS, CSS4_COLORS, XKCD_COLORS
 
 
 class _ColorMapping(dict):
-    def __init__(self, mapping, cache):
+    def __init__(self, mapping):
         super(_ColorMapping, self).__init__(mapping)
-        self._cache = cache
+        self._cache = {}
 
     def __setitem__(self, key, value):
         super(_ColorMapping, self).__setitem__(key, value)
@@ -82,18 +82,11 @@ def __delitem__(self, key, value):
         self._cache.clear()
 
 
-_colors_full_map = {
-    'b': (0, 0, 1),
-    'g': (0, 0.5, 0),
-    'r': (1, 0, 0),
-    'c': (0, 0.75, 0.75),
-    'm': (0.75, 0, 0.75),
-    'y': (0.75, 0.75, 0),
-    'k': (0, 0, 0),
-    'w': (1, 1, 1)}
-_colors_full_map.update(XKCD_COLORS)
+_colors_full_map = {}
+_colors_full_map.update(BASE_COLORS)
 _colors_full_map.update(CSS4_COLORS)
-_colors_full_map = _ColorMapping(_colors_full_map, {})
+_colors_full_map.update(XKCD_COLORS)
+_colors_full_map = _ColorMapping(_colors_full_map)
 
 
 def get_named_colors_mapping():
