Skip to content

DataFrame.plot error when both 'color' and 'style' arguments are passed (GH9671) #9674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

DataFrame.plot error when both 'color' and 'style' arguments are passed (GH9671) #9674

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fe39d3c
Fix for issue #9671
Mar 17, 2015
07fff67
Added test for bug fix of issue #9671
davidbrochart Mar 18, 2015
6d4b37f
Merge remote-tracking branch 'upstream/master' into HEAD
davidbrochart Mar 18, 2015
72c5bc1
Made a separate test called test_color_and_style_arguments, made chan…
davidbrochart Mar 18, 2015
025de9d
BUG: Fix for #9764
tomazberisa Apr 3, 2015
e375dd7
TST: Test for #9764 fix
tomazberisa Apr 3, 2015
86a1404
TST: Test saves and restore context (#9764)
tomazberisa Apr 3, 2015
7857c43
CLN: Test code cleanup (#9764)
tomazberisa Apr 4, 2015
ce988b4
DOC: Update whatsnew for 0.16.1 (#9764)
tomazberisa Apr 4, 2015
2af2044
Merge pull request #9812 from sinhrks/sec_legend
Apr 5, 2015
e9179fe
BUG: DataFrame.equals should not care about block order (GH #9330)
dsm054 Mar 28, 2015
1fafe76
Merge pull request #9806 from tomazberisa/df-display-bug
shoyer Apr 6, 2015
94ec6c3
Fixed bug #9671 where 'DataFrame.plot()' raised an error when both 'c…
Mar 17, 2015
b00da07
DOC: Update whatsnew for 0.16.1 (#9671)
davidbrochart Apr 6, 2015
2c56676
Merge branch 'plot_style_fix_and_test' of https://github.com/davidbro…
davidbrochart Apr 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pandas/tests/test_graphics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,18 @@ def test_plot(self):
df = DataFrame({'x': [1, 2], 'y': [3, 4]})
with tm.assertRaises(TypeError):
df.plot(kind='line', blarg=True)
try:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of wrapping the code in try / except plots, just call the function.

ax = df.plot(color=['red', 'black'], style=['-', '--']) and then make sure the color and styles match what's expected.
You can get the actual linestyle with result = [line.get_linestyle() for line in ax.lines]
Then compare that to the expected with self.assertEqual(result, ['-', '--'])

Same thing for the colors, [line.get_color() for line in ax.lines]

df.plot(color = ['red', 'black'], style = ['-', '--'])
df['x'].plot(color = 'red', style = '-')
except:
self.fail("Calling 'plot()' on a dataframe/series and passing both 'color' and 'style' arguments should be allowed if there is no color symbol in the style string(s)")
try:
df.plot(color = ['red', 'black'], style = ['k-', 'r--'])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one should raise and exception, so you can use the tm.assertRaises context manager

with tm.assertRaises(ValueError):
     df.plot(color = ['red', 'black'], style = ['k-', 'r--'])

so that the test passes if a ValueError is raised, and fails if it doesn't.

df['x'].plot(color = 'red', style = 'k-')
except:
pass
else:
self.fail("Calling 'plot()' on a dataframe/series and passing both 'color' and 'style' arguments should raise an error if there is a color symbol in the style string(s)")

df = DataFrame(np.random.rand(10, 3),
index=list(string.ascii_letters[:10]))
Expand Down
15 changes: 10 additions & 5 deletions pandas/tools/plotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,12 +871,17 @@ def _validate_color_args(self):
"simultaneously. Using 'color'")

if 'color' in self.kwds and self.style is not None:
if com.is_list_like(self.style):
styles = self.style
else:
styles = [self.style]
# need only a single match
if re.match('^[a-z]+?', self.style) is not None:
raise ValueError("Cannot pass 'style' string with a color "
"symbol and 'color' keyword argument. Please"
" use one or the other or pass 'style' "
"without a color symbol")
for s in styles:
if re.match('^[a-z]+?', s) is not None:
raise ValueError("Cannot pass 'style' string with a color "
"symbol and 'color' keyword argument. Please"
" use one or the other or pass 'style' "
"without a color symbol")

def _iter_data(self, data=None, keep_index=False, fillna=None):
if data is None:
Expand Down