Remove some references to colorConverter.

anntzer · anntzer · commit b741534dd397 · 2018-07-21T15:39:59.000+02:00
Its (static)methods are available as freestanding functions now.
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -546,23 +546,23 @@ def __copy__(self):
     def set_bad(self, color='k', alpha=None):
         """Set color to be used for masked values.
         """
-        self._rgba_bad = colorConverter.to_rgba(color, alpha)
+        self._rgba_bad = to_rgba(color, alpha)
         if self._isinit:
             self._set_extremes()
 
     def set_under(self, color='k', alpha=None):
         """Set color to be used for low out-of-range values.
            Requires norm.clip = False
         """
-        self._rgba_under = colorConverter.to_rgba(color, alpha)
+        self._rgba_under = to_rgba(color, alpha)
         if self._isinit:
             self._set_extremes()
 
     def set_over(self, color='k', alpha=None):
         """Set color to be used for high out-of-range values.
            Requires norm.clip = False
         """
-        self._rgba_over = colorConverter.to_rgba(color, alpha)
+        self._rgba_over = to_rgba(color, alpha)
         if self._isinit:
             self._set_extremes()
 
@@ -717,7 +717,7 @@ def from_list(name, colors, N=256, gamma=1.0):
 
         cdict = dict(red=[], green=[], blue=[], alpha=[])
         for val, color in zip(vals, colors):
-            r, g, b, a = colorConverter.to_rgba(color)
+            r, g, b, a = to_rgba(color)
             cdict['red'].append((val, r, r))
             cdict['green'].append((val, g, g))
             cdict['blue'].append((val, b, b))
@@ -817,9 +817,8 @@ def __init__(self, colors, name='from_list', N=None):
         Colormap.__init__(self, name, N)
 
     def _init(self):
-        rgba = colorConverter.to_rgba_array(self.colors)
         self._lut = np.zeros((self.N + 3, 4), float)
-        self._lut[:-3] = rgba
+        self._lut[:-3] = to_rgba_array(self.colors)
         self._isinit = True
         self._set_extremes()
 
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -5549,13 +5549,13 @@ def test_quiver_units():
 
 
 def test_bar_color_cycle():
-    ccov = mcolors.colorConverter.to_rgb
+    to_rgb = mcolors.to_rgb
     fig, ax = plt.subplots()
     for j in range(5):
         ln, = ax.plot(range(3))
         brs = ax.bar(range(3), range(3))
         for br in brs:
-            assert ccov(ln.get_color()) == ccov(br.get_facecolor())
+            assert to_rgb(ln.get_color()) == to_rgb(br.get_facecolor())
 
 
 def test_tick_param_label_rotation():
