Commit554b784

committed

Scatter ravel is performed before _process_unit_info() is called.

1 parent4aa7efe commit554b784Copy full SHA for 554b784

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4657,14 +4657,14 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`4657`	`4657`	`# further processed by the rest of the function`
`4658`	`4658`	`linewidths=kwargs.pop('linewidth',None)`
`4659`	`4659`	`edgecolors=kwargs.pop('edgecolor',None)`
`4660`		`-# Process **kwargs to handle aliases, conflicts with explicit kwargs:`
`4661`		`-x,y=self._process_unit_info([("x",x), ("y",y)],kwargs)`
`4662`	`4660`	`# np.ma.ravel yields an ndarray, not a masked array,`
`4663`	`4661`	`# unless its argument is a masked array.`
`4664`	`4662`	`x=np.ma.ravel(x)`
`4665`	`4663`	`y=np.ma.ravel(y)`
`4666`	`4664`	`ifx.size!=y.size:`
`4667`	`4665`	`raiseValueError("x and y must be the same size")`
	`4666`	`+# Process **kwargs to handle aliases, conflicts with explicit kwargs:`
	`4667`	`+x,y=self._process_unit_info([("x",x), ("y",y)],kwargs)`
`4668`	`4668`
`4669`	`4669`	`ifsisNone:`
`4670`	`4670`	`s= (20ifmpl.rcParams['_internal.classic_mode']else`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,9 @@ def test_update_plot(self, plotter):`
`253`	`253`
`254`	`254`	`fids,fvalues=zip(*failing_test_cases)`
`255`	`255`
`256`		`-plotters= [Axes.scatter,Axes.bar,`
	`256`	`+# plotters = [Axes.scatter, Axes.bar,`
	`257`	`+# pytest.param(Axes.plot, marks=pytest.mark.xfail)]`
	`258`	`+plotters= [Axes.bar,`
`257`	`259`	`pytest.param(Axes.plot,marks=pytest.mark.xfail)]`
`258`	`260`
`259`	`261`	`@pytest.mark.parametrize("plotter",plotters)`

Comments

(0)