NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.4k

Commitaa975c2

committed

make Axes._parse_scatter_color_args static

1 parentac0525e commitaa975c2Copy full SHA for aa975c2

File tree

2 files changed

+26

-9

lines changed

lib/matplotlib
- axes
  - _axes.py
- tests
  - test_axes.py

2 files changed

+26

-9

lines changed

`‎lib/matplotlib/axes/_axes.py`

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4013,7 +4013,9 @@ def dopatch(xs, ys, **kwargs):`
`4013`	`4013`	`returndict(whiskers=whiskers,caps=caps,boxes=boxes,`
`4014`	`4014`	`medians=medians,fliers=fliers,means=means)`
`4015`	`4015`
`4016`		`-def_parse_scatter_color_args(self,c,edgecolors,kwargs,xshape,yshape):`
	`4016`	`+@staticmethod`
	`4017`	`+def_parse_scatter_color_args(c,edgecolors,kwargs,xshape,yshape,`
	`4018`	`+get_next_color_func):`
`4017`	`4019`	`"""`
`4018`	`4020`	Helper function to process color related arguments of `.Axes.scatter`.
`4019`	`4021`
`@@ -4023,7 +4025,7 @@ def _parse_scatter_color_args(self, c, edgecolors, kwargs, xshape, yshape):`
`4023`	`4025`	`- kwargs['facecolors']`
`4024`	`4026`	`- kwargs['facecolor']`
`4025`	`4027`	`- kwargs['color'] (==kwcolor)`
`4026`		`- - 'b' if in classic mode elsenext color from color cycle`
	`4028`	+ - 'b' if in classic mode elsethe result of ``get_next_color_func()``
`4027`	`4029`
`4028`	`4030`	`Argument precedence for edgecolors:`
`4029`	`4031`
`@@ -4044,6 +4046,9 @@ def _parse_scatter_color_args(self, c, edgecolors, kwargs, xshape, yshape):`
`4044`	`4046`	`Note: The dict is modified by this function.`
`4045`	`4047`	`xshape, yshape : tuple of int`
`4046`	`4048`	The shape of the x and y arrays passed to `.Axes.scatter`.
	`4049`	`+ get_next_color_func : callable`
	`4050`	`+ A callable that returns a color. This color is used as facecolor`
	`4051`	`+ if no other color is provided.`
`4047`	`4052`
`4048`	`4053`	`Returns`
`4049`	`4054`	`-------`
`@@ -4090,7 +4095,7 @@ def _parse_scatter_color_args(self, c, edgecolors, kwargs, xshape, yshape):`
`4090`	`4095`	`ifcisNone:`
`4091`	`4096`	`c= (facecolorsiffacecolorsisnotNone`
`4092`	`4097`	`else"b"ifrcParams['_internal.classic_mode']`
`4093`		`-elseself._get_patches_for_fill.get_next_color())`
	`4098`	`+elseget_next_color_func())`
`4094`	`4099`
`4095`	`4100`	`# After this block, c_array will be None unless`
`4096`	`4101`	`# c is an array for mapping. The potential ambiguity`
`@@ -4289,8 +4294,9 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`4289`	`4294`	`s=np.ma.ravel(s)# This doesn't have to match x, y in size.`
`4290`	`4295`
`4291`	`4296`	`c,colors,edgecolors= \`
`4292`		`-self._parse_scatter_color_args(c,edgecolors,kwargs,`
`4293`		`-xshape,yshape)`
	`4297`	`+self._parse_scatter_color_args(`
	`4298`	`+c,edgecolors,kwargs,xshape,yshape,`
	`4299`	`+get_next_color_func=self._get_patches_for_fill.get_next_color)`
`4294`	`4300`
`4295`	`4301`	# `delete_masked_points` only modifies arguments of the same length as
`4296`	`4302`	# `x`.

`‎lib/matplotlib/tests/test_axes.py`

Lines changed: 15 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1793,19 +1793,30 @@ def test_scatter_color(self):`
`1793`	`1793`
`1794`	`1794`	`@pytest.mark.parametrize('c_case, re_key',params_test_scatter_c)`
`1795`	`1795`	`deftest_scatter_c(self,c_case,re_key):`
	`1796`	`+defget_next_color():`
	`1797`	`+return'blue'# currently unused`
	`1798`	`+`
	`1799`	`+frommatplotlib.axesimportAxes`
	`1800`	`+`
	`1801`	`+xshape=yshape= (4,)`
	`1802`	`+`
`1796`	`1803`	`# Additional checking of c (introduced in #11383).`
`1797`	`1804`	`REGEXP= {`
`1798`	`1805`	`"shape":"^'c' argument has [0-9]+ elements",# shape mismatch`
`1799`	`1806`	`"conversion":"^'c' argument must be a mpl color",# bad vals`
`1800`	`1807`	`}`
`1801`		`-x=y= [0,1,2,3]`
`1802`		`-fig,ax=plt.subplots()`
`1803`	`1808`
`1804`	`1809`	`ifre_keyisNone:`
`1805`		`-ax.scatter(x,y,c=c_case,edgecolors="black")`
	`1810`	`+Axes._parse_scatter_color_args(`
	`1811`	`+c=c_case,edgecolors="black",kwargs={},`
	`1812`	`+xshape=xshape,yshape=yshape,`
	`1813`	`+get_next_color_func=get_next_color)`
`1806`	`1814`	`else:`
`1807`	`1815`	`withpytest.raises(ValueError,match=REGEXP[re_key]):`
`1808`		`-ax.scatter(x,y,c=c_case,edgecolors="black")`
	`1816`	`+Axes._parse_scatter_color_args(`
	`1817`	`+c=c_case,edgecolors="black",kwargs={},`
	`1818`	`+xshape=xshape,yshape=yshape,`
	`1819`	`+get_next_color_func=get_next_color)`
`1809`	`1820`
`1810`	`1821`
`1811`	`1822`	`def_params(c=None,xshape=(2,),yshape=(2,),**kwargs):`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitaa975c2

File tree

2 files changed

2 files changed

`‎lib/matplotlib/axes/_axes.py`

`‎lib/matplotlib/tests/test_axes.py`

0 commit comments