Commit2fc3ed6

committed

Improve error messages for mismatched s arg to scatter().

- Display array sizes in case of size mismatch.- Display a clearer, distinct error message when `s` is not real.

1 parentfdf8995 commit2fc3ed6Copy full SHA for 2fc3ed6

File tree

-9

lines changed

-9

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -5309,12 +5309,12 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`5309`	`5309`	`s= (20ifmpl.rcParams['_internal.classic_mode']else`
`5310`	`5310`	`mpl.rcParams['lines.markersize']**2.0)`
`5311`	`5311`	`s=np.ma.ravel(s)`
`5312`		`-if(len(s)notin (1,x.size)or`
`5313`		`-(notnp.issubdtype(s.dtype,np.floating)and`
`5314`		`-notnp.issubdtype(s.dtype,np.integer))):`
`5315`		`-raiseValueError(`
`5316`		`-"s must bea scalar, "`
`5317`		`-"or float array-like with the same size asx and y")`
	`5312`	`+ifnot(np.issubdtype(s.dtype,np.floating)`
	`5313`	`+ornp.issubdtype(s.dtype,np.integer)):`
	`5314`	`+raiseValueError(f"s must be float, but has type{s.dtype}")`
	`5315`	`+iflen(s)notin (1,x.size):`
	`5316`	`+raiseValueError(f"s (size{len(s)}) cannot bebroadcast "`
	`5317`	`+f"to matchx and y (size{len(x)})")`
`5318`	`5318`
`5319`	`5319`	`# get the original edgecolor the user passed before we normalize`
`5320`	`5320`	`orig_edgecolor=edgecolors`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2958,11 +2958,11 @@ def test_scatter_unfillable(self):`
`2958`	`2958`
`2959`	`2959`	`deftest_scatter_size_arg_size(self):`
`2960`	`2960`	`x=np.arange(4)`
`2961`		`-withpytest.raises(ValueError,match='same size as x and y'):`
	`2961`	`+withpytest.raises(ValueError,match='cannot be broadcast to match x and y'):`
`2962`	`2962`	`plt.scatter(x,x,x[1:])`
`2963`		`-withpytest.raises(ValueError,match='same size as x and y'):`
	`2963`	`+withpytest.raises(ValueError,match='cannot be broadcast to match x and y'):`
`2964`	`2964`	`plt.scatter(x[1:],x[1:],x)`
`2965`		`-withpytest.raises(ValueError,match='float array-like'):`
	`2965`	`+withpytest.raises(ValueError,match='must be float'):`
`2966`	`2966`	`plt.scatter(x,x,'foo')`
`2967`	`2967`
`2968`	`2968`	`deftest_scatter_edgecolor_RGB(self):`

Comments

(0)