Commit557ddea

committed

updated fix for#8818

1 parent73101a2 commit557ddeaCopy full SHA for 557ddea

File tree

+14

-11

lines changed

+14

-11

lines changed

Lines changed: 13 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,24 +55,26 @@ def _plot_args_replacer(args, data):`
`55`	`55`	`return ["y"]`
`56`	`56`	`eliflen(args)==2:`
`57`	`57`	`# this can be two cases: x,y or y,c`
	`58`	`+if (notargs[1]indataand`
	`59`	`+not (hasattr(data,'dtype')and`
	`60`	`+hasattr(data.dtype,'names')and`
	`61`	`+data.dtype.namesisnotNoneand`
	`62`	`+args[1]indata.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"]`
`58`	`66`	`# it's data, but could be a color code like 'ro' or 'b--'`
`59`	`67`	`# -> warn the user in that case...`
`60`		`-`
`61`	`68`	`try:`
`62`	`69`	`_process_plot_format(args[1])`
`63`	`70`	`exceptValueError:`
`64`	`71`	`pass`
`65`	`72`	`else:`
`66`		`-# arg can be parsed into colour; verify arg is not data`
`67`		`-ifnotargs[1]indata:`
`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)`
`76`	`78`	`return ["x","y"]`
`77`	`79`	`eliflen(args)==3:`
`78`	`80`	`return ["x","y","c"]`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -588,6 +588,7 @@ def test_structured_data():`
`588`	`588`	`# support for stuctured data`
`589`	`589`	`pts=np.array([(1,1), (2,2)],dtype=[("ones",float), ("twos",float)])`
`590`	`590`
	`591`	`+# this should not read second name as a format and raise ValueError`
`591`	`592`	`fig,ax=plt.subplots(2)`
`592`	`593`	`ax[0].plot("ones","twos",data=pts)`
`593`	`594`	`ax[1].plot("ones","twos","r",data=pts)`

Comments

(0)