8000 Remove some references to colorConverter. · matplotlib/matplotlib@b741534 · GitHub
[go: up one dir, main page]

Skip to content

Commit b741534

Browse files
committed
Remove some references to colorConverter.
Its (static)methods are available as freestanding functions now.
1 parent 4b1f956 commit b741534

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

lib/matplotlib/colors.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -546,23 +546,23 @@ def __copy__(self):
546546
def set_bad(self, color='k', alpha=None):
547547
"""Set color to be used for masked values.
548548
"""
549-
self._rgba_bad = colorConverter.to_rgba(color, alpha)
549+
self._rgba_bad = to_rgba(color, alpha)
550550
if self._isinit:
551551
self._set_extremes()
552552

553553
def set_under(self, color='k', alpha=None):
554554
"""Set color to be used for low out-of-range values.
555555
Requires norm.clip = False
556556
"""
557-
self._rgba_under = colorConverter.to_rgba(color, alpha)
557+
self._rgba_under = to_rgba(color, alpha)
558558
if self._isinit:
559559
self._set_extremes()
560560

561561
def set_over(self, color='k', alpha=None):
562562
"""Set color to be used for high out-of-range values.
563563
Requires norm.clip = False
564564
"""
565-
self._rgba_over = colorConverter.to_rgba(color, alpha)
565+
self._rgba_over = to_rgba(color, alpha)
566566
if self._isinit:
567567
self._set_extremes()
568568

@@ -717,7 +717,7 @@ def from_list(name, colors, N=256, gamma=1.0):
717717

718718
cdict = dict(red=[], green=[], blue=[], alpha=[])
719719
for val, color in zip(vals, colors):
720-
r, g, b, a = colorConverter.to_rgba(color)
720+
r, g, b, a = to_rgba(color)
721721
cdict['red'].append((val, r, r))
722722
cdict['green'].append((val, g, g))
723723
cdict['blue'].append((val, b, b))
@@ -817,9 +817,8 @@ def __init__(self, colors, name='from_list', N=None):
817817
Colormap.__init__(self, name, N)
818818

819819
def _init(self):
820-
rgba = colorConverter.to_rgba_array(self.colors)
821820
self._lut = np.zeros((self.N + 3, 4), float)
822-
self._lut[:-3] = rgba
821+
self._lut[:-3] = to_rgba_array(self.colors)
823822
self._isinit = True
824823
self._set_extremes()
825824

lib/matplotlib/tests/test_axes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5549,13 +5549,13 @@ def test_quiver_units():
55495549

55505550

55515551
def test_bar_color_cycle():
5552-
ccov = mcolors.colorConverter.to_rgb
5552+
to_rgb = mcolors.to_rgb
55535553
fig, ax = plt.subplots()
55545554
for j in range(5):
55555555
ln, = ax.plot(range(3))
55565556
brs = ax.bar(range(3), range(3))
55575557
for br in brs:
5558-
assert ccov(ln.get_color()) == ccov(br.get_facecolor())
5558+
assert to_rgb(ln.get_color()) == to_rgb(br.get_facecolor())
55595559

55605560

55615561
def test_tick_param_label_rotation():

0 commit comments

Comments
 (0)
0