Commitbcb372b

authored

Merge pull request#12673 from esvhd/axes_iob

Fix for _axes.scatter() array index out of bound error

2 parentsd779b8b +e2ca262 commitbcb372bCopy full SHA for bcb372b

File tree

+26

-3

lines changed

+26

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4195,8 +4195,9 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,`
`4195`	`4195`	`if (c_noneor`
`4196`	`4196`	`coisnotNoneor`
`4197`	`4197`	`isinstance(c,str)or`
`4198`		`- (isinstance(c,collections.abc.Iterable)and`
`4199`		`-isinstance(c[0],str))):`
	`4198`	`+ (isinstance(c,collections.Iterable)and`
	`4199`	`+len(c)>0and`
	`4200`	`+isinstance(cbook.safe_first_element(c),str))):`
`4200`	`4201`	`c_array=None`
`4201`	`4202`	`else:`
`4202`	`4203`	`try:# First, does 'c' look suitable for value-mapping?`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5828,7 +5828,7 @@ def test_spines_properbbox_after_zoom():`
`5828`	`5828`	`bb=ax.spines['bottom'].get_window_extent(fig.canvas.get_renderer())`
`5829`	`5829`	`# this is what zoom calls:`
`5830`	`5830`	`ax._set_view_from_bbox((320,320,500,500),'in',`
`5831`		`-None,False,False)`
	`5831`	`+None,False,False)`
`5832`	`5832`	`bb2=ax.spines['bottom'].get_window_extent(fig.canvas.get_renderer())`
`5833`	`5833`	`np.testing.assert_allclose(bb.get_points(),bb2.get_points(),rtol=1e-6)`
`5834`	`5834`
`@@ -5856,3 +5856,18 @@ def test_gettightbbox_ignoreNaN():`
`5856`	`5856`	`t=ax.text(np.NaN,1,'Boo')`
`5857`	`5857`	`renderer=fig.canvas.get_renderer()`
`5858`	`5858`	`np.testing.assert_allclose(ax.get_tightbbox(renderer).width,532.444444)`
	`5859`	`+`
	`5860`	`+`
	`5861`	`+deftest_scatter_series_non_zero_index(pd):`
	`5862`	`+# create non-zero index`
	`5863`	`+ids=range(10,18)`
	`5864`	`+x=pd.Series(np.random.uniform(size=8),index=ids)`
	`5865`	`+y=pd.Series(np.random.uniform(size=8),index=ids)`
	`5866`	`+c=pd.Series([1,1,1,1,1,0,0,0],index=ids)`
	`5867`	`+plt.scatter(x,y,c)`
	`5868`	`+`
	`5869`	`+`
	`5870`	`+deftest_scatter_empty_data():`
	`5871`	`+# making sure this does not raise an exception`
	`5872`	`+plt.scatter([], [])`
	`5873`	`+plt.scatter([], [],s=[],c=[])`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -526,3 +526,10 @@ def test_contiguous_regions():`
`526`	`526`	`assertcbook.contiguous_regions([False]*5)== []`
`527`	`527`	`# Empty mask`
`528`	`528`	`assertcbook.contiguous_regions([])== []`
	`529`	`+`
	`530`	`+`
	`531`	`+deftest_safe_first_element_pandas_series(pd):`
	`532`	`+# delibrately create a pandas series with index not starting from 0`
	`533`	`+s=pd.Series(range(5),index=range(10,15))`
	`534`	`+actual=cbook.safe_first_element(s)`
	`535`	`+assertactual==0`

Comments

(0)