Commitbf2af86

authored

Merge pull request#25070 from meeseeksmachine/auto-backport-of-pr-25058-on-v3.7.x

Backport PR#25058 on branch v3.7.x (fix for pcolormesh doesn't allow shading = 'flat' in the option)

2 parentsf06f866 +fb4a40c commitbf2af86Copy full SHA for bf2af86

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5748,9 +5748,10 @@ def _pcolorargs(self, funcname, args, shading='auto', *kwargs):`
`5748`	`5748`
`5749`	`5749`	`ifshading=='flat':`
`5750`	`5750`	`if (Nx,Ny)!= (ncols+1,nrows+1):`
`5751`		`-raiseTypeError('Dimensions of C %s are incompatible with'`
`5752`		`-' X (%d) and/or Y (%d); see help(%s)'% (`
`5753`		`-C.shape,Nx,Ny,funcname))`
	`5751`	`+raiseTypeError(f"Dimensions of C{C.shape} should"`
	`5752`	`+f" be one smaller than X({Nx}) and Y({Ny})"`
	`5753`	`+f" while using shading='flat'"`
	`5754`	`+f" see help({funcname})")`
`5754`	`5755`	`else:# ['nearest', 'gouraud']:`
`5755`	`5756`	`if (Nx,Ny)!= (ncols,nrows):`
`5756`	`5757`	`raiseTypeError('Dimensions of C %s are incompatible with'`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1439,6 +1439,14 @@ def test_pcolorflaterror():`
`1439`	`1439`	`ax.pcolormesh(x,y,Z,shading='flat')`
`1440`	`1440`
`1441`	`1441`
	`1442`	`+deftest_samesizepcolorflaterror():`
	`1443`	`+fig,ax=plt.subplots()`
	`1444`	`+x,y=np.meshgrid(np.arange(5),np.arange(3))`
	`1445`	`+Z=x+y`
	`1446`	`+withpytest.raises(TypeError,match=r".*one smaller than X"):`
	`1447`	`+ax.pcolormesh(x,y,Z,shading='flat')`
	`1448`	`+`
	`1449`	`+`
`1442`	`1450`	`@pytest.mark.parametrize('snap', [False,True])`
`1443`	`1451`	`@check_figures_equal(extensions=["png"])`
`1444`	`1452`	`deftest_pcolorauto(fig_test,fig_ref,snap):`

Comments

(0)