Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 557ddea

Browse filesBrowse files
committed
updated fix for #8818
1 parent 73101a2 commit 557ddea
Copy full SHA for 557ddea

File tree

Expand file treeCollapse file tree

2 files changed

+14
-11
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+14
-11
lines changed

‎lib/matplotlib/axes/_axes.py

Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_axes.py
+13-11Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,26 @@ def _plot_args_replacer(args, data):
5555
return ["y"]
5656
elif len(args) == 2:
5757
# this can be two cases: x,y or y,c
58+
if (not args[1] in data and
59+
not (hasattr(data, 'dtype') and
60+
hasattr(data.dtype, 'names') and
61+
data.dtype.names is not None and
62+
args[1] in data.dtype.names)):
63+
# this is not in data, so just assume that it is something which
64+
# will not get replaced (color spec or array like).
65+
return ["y", "c"]
5866
# it's data, but could be a color code like 'ro' or 'b--'
5967
# -> warn the user in that case...
60-
6168
try:
6269
_process_plot_format(args[1])
6370
except ValueError:
6471
pass
6572
else:
66-
# arg can be parsed into colour; verify arg is not data
67-
if not args[1] in data:
68-
return ["y", "c"]
69-
else:
70-
warnings.warn(
71-
"Second argument {!r} is ambiguous: could be a color spec "
72-
"but is in data; using as data. Either rename the entry "
73-
"in data or use three arguments to plot.".format(args[1]),
74-
RuntimeWarning, stacklevel=3)
75-
73+
warnings.warn(
74+
"Second argument {!r} is ambiguous: could be a color spec but "
75+
"is in data; using as data. Either rename the entry in data "
76+
"or use three arguments to plot.".format(args[1]),
77+
RuntimeWarning, stacklevel=3)
7678
return ["x", "y"]
7779
elif len(args) == 3:
7880
return ["x", "y", "c"]

‎lib/matplotlib/tests/test_axes.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_axes.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,7 @@ def test_structured_data():
588588
# support for stuctured data
589589
pts = np.array([(1, 1), (2, 2)], dtype=[("ones", float), ("twos", float)])
590590

591+
# this should not read second name as a format and raise ValueError
591592
fig, ax = plt.subplots(2)
592593
ax[0].plot("ones", "twos", data=pts)
593594
ax[1].plot("ones", "twos", "r", data=pts)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.