Commit7647550

authored

Merge pull request#18042 from QuLogic/scatter-size

scatter: Raise if unexpected type of `s` argument.

2 parents0a83b9c +bda5766 commit7647550Copy full SHA for 7647550

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4447,8 +4447,12 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`4447`	`4447`	`s= (20ifrcParams['_internal.classic_mode']else`
`4448`	`4448`	`rcParams['lines.markersize']**2.0)`
`4449`	`4449`	`s=np.ma.ravel(s)`
`4450`		`-iflen(s)notin (1,x.size):`
`4451`		`-raiseValueError("s must be a scalar, or the same size as x and y")`
	`4450`	`+if (len(s)notin (1,x.size)or`
	`4451`	`+ (notnp.issubdtype(s.dtype,np.floating)and`
	`4452`	`+notnp.issubdtype(s.dtype,np.integer))):`
	`4453`	`+raiseValueError(`
	`4454`	`+"s must be a scalar, "`
	`4455`	`+"or float array-like with the same size as x and y")`
`4452`	`4456`
`4453`	`4457`	`c,colors,edgecolors= \`
`4454`	`4458`	`self._parse_scatter_color_args(`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1909,10 +1909,12 @@ def test_scatter_unfilled(self):`
`1909`	`1909`
`1910`	`1910`	`deftest_scatter_size_arg_size(self):`
`1911`	`1911`	`x=np.arange(4)`
`1912`		`-withpytest.raises(ValueError):`
	`1912`	`+withpytest.raises(ValueError,match='same size as x and y'):`
`1913`	`1913`	`plt.scatter(x,x,x[1:])`
`1914`		`-withpytest.raises(ValueError):`
	`1914`	`+withpytest.raises(ValueError,match='same size as x and y'):`
`1915`	`1915`	`plt.scatter(x[1:],x[1:],x)`
	`1916`	`+withpytest.raises(ValueError,match='float array-like'):`
	`1917`	`+plt.scatter(x,x,'foo')`
`1916`	`1918`
`1917`	`1919`	`@check_figures_equal(extensions=["png"])`
`1918`	`1920`	`deftest_scatter_invalid_color(self,fig_test,fig_ref):`

Comments

(0)