Skip to content

Commit

Permalink
BUG: Fix regression for RGB(A) color arguments (#16701)
Browse files Browse the repository at this point in the history
* Add test

* Pass tuples that are RGB or RGBA like in list

* Update what's new

* change whatsnew to reflect regression fix

* Add test for RGBA as well
  • Loading branch information
kjford authored and TomAugspurger committed Jun 16, 2017
1 parent 3ff845b commit 125c414
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v0.20.3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ I/O

Plotting
^^^^^^^^

- Fix regression in series plotting that prevented RGB and RGBA tuples from being used as color arguments (:issue:`16233`)



Expand Down
5 changes: 5 additions & 0 deletions pandas/plotting/_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ def _validate_color_args(self):
# support series.plot(color='green')
self.kwds['color'] = [self.kwds['color']]

if ('color' in self.kwds and isinstance(self.kwds['color'], tuple) and
self.nseries == 1 and len(self.kwds['color']) in (3, 4)):
# support RGB and RGBA tuples in series plot
self.kwds['color'] = [self.kwds['color']]

if ('color' in self.kwds or 'colors' in self.kwds) and \
self.colormap is not None:
warnings.warn("'color' and 'colormap' cannot be used "
Expand Down
6 changes: 6 additions & 0 deletions pandas/tests/plotting/test_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,12 @@ def test_color_single_series_list(self):
df = DataFrame({"A": [1, 2, 3]})
_check_plot_works(df.plot, color=['red'])

def test_rgb_tuple_color(self):
# GH 16695
df = DataFrame({'x': [1, 2], 'y': [3, 4]})
_check_plot_works(df.plot, x='x', y='y', color=(1, 0, 0))
_check_plot_works(df.plot, x='x', y='y', color=(1, 0, 0, 0.5))

def test_color_empty_string(self):
df = DataFrame(randn(10, 2))
with pytest.raises(ValueError):
Expand Down

0 comments on commit 125c414

Please sign in to comment.