FIX: restore single character colors to rgb tuples

tacaswell · tacaswell · commit 9feeb9eb2650 · 2016-01-17T20:53:07.000-05:00
The hex representations are not exact which resulted in
very small slight color changes.
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -105,17 +105,17 @@ class ColorConverter(object):
     *colorConverter*, is needed.
     """
     colors = {
-        'b': '#0000ff',
-        'r': '#ff0000',
-        'g': '#008000',
-        'c': '#00bfbf',
-        'm': '#bf00bf',
-        'y': '#bfbf00',
-        'k': '#000000',
-        'w': '#ffffff'}
+        '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)}
 
     cache = {}
-    CN_LOOKUPS = [colors, ] + [COLOR_NAMES[k] for k in ['css4', 'xkcd']]
+    CN_LOOKUPS = [COLOR_NAMES[k] for k in ['css4', 'xkcd']]
 
     def to_rgb(self, arg):
         """
@@ -152,18 +152,20 @@ def to_rgb(self, arg):
         try:
             if cbook.is_string_like(arg):
                 argl = arg.lower()
-                for cmapping in self.CN_LOOKUPS:
-                    str1 = cmapping.get(argl, argl)
-                    if str1 != argl:
-                        break
-                if str1.startswith('#'):
-                    color = hex2color(str1)
-                else:
-                    fl = float(argl)
-                    if fl < 0 or fl > 1:
-                        raise ValueError(
-                            'gray (string) must be in range 0-1')
-                    color = (fl,)*3
+                color = self.colors.get(argl, None)
+                if color is None:
+                    for cmapping in self.CN_LOOKUPS:
+                        str1 = cmapping.get(argl, argl)
+                        if str1 != argl:
+                            break
+                    if str1.startswith('#'):
+                        color = hex2color(str1)
+                    else:
+                        fl = float(argl)
+                        if fl < 0 or fl > 1:
+                            raise ValueError(
+                                'gray (string) must be in range 0-1')
+                        color = (fl,)*3
             elif cbook.iterable(arg):
                 if len(arg) > 4 or len(arg) < 3:
                     raise ValueError(
