Commit5669261

authored

Merge pull request#10810 from zhangeugenia/bugfix-for-issue-8818

Fix for plt.plot() does not support structured arrays as data= kwarg

2 parents51c79c8 +557ddea commit5669261Copy full SHA for 5669261

File tree

+15

-1

lines changed

+15

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,11 @@ def _plot_args_replacer(args, data):`
`49`	`49`	`return ["y"]`
`50`	`50`	`eliflen(args)==2:`
`51`	`51`	`# this can be two cases: x,y or y,c`
`52`		`-ifnotargs[1]indata:`
	`52`	`+if (notargs[1]indataand`
	`53`	`+not (hasattr(data,'dtype')and`
	`54`	`+hasattr(data.dtype,'names')and`
	`55`	`+data.dtype.namesisnotNoneand`
	`56`	`+args[1]indata.dtype.names)):`
`53`	`57`	`# this is not in data, so just assume that it is something which`
`54`	`58`	`# will not get replaced (color spec or array like).`
`55`	`59`	`return ["y","c"]`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -584,6 +584,16 @@ def test_shaped_data():`
`584`	`584`	`plt.plot(xdata[:,1],xdata[1, :],'o')`
`585`	`585`
`586`	`586`
	`587`	`+deftest_structured_data():`
	`588`	`+# support for stuctured data`
	`589`	`+pts=np.array([(1,1), (2,2)],dtype=[("ones",float), ("twos",float)])`
	`590`	`+`
	`591`	`+# this should not read second name as a format and raise ValueError`
	`592`	`+fig,ax=plt.subplots(2)`
	`593`	`+ax[0].plot("ones","twos",data=pts)`
	`594`	`+ax[1].plot("ones","twos","r",data=pts)`
	`595`	`+`
	`596`	`+`
`587`	`597`	`@image_comparison(baseline_images=['const_xy'])`
`588`	`598`	`deftest_const_xy():`
`589`	`599`	`fig=plt.figure()`

Comments

(0)