Commitc301723

authored and

committed

Backport PRmatplotlib#26513: Tweak shape repr in _api.check_shape error message.

1 parent275a23f commitc301723Copy full SHA for c301723

File tree

+13

-13

lines changed

+13

-13

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,12 +151,10 @@ def check_shape(shape, /, **kwargs):`
`151`	`151`	`if (len(data_shape)!=len(shape)`
`152`	`152`	`orany(s!=tandtisnotNonefors,tinzip(data_shape,shape))):`
`153`	`153`	`dim_labels=iter(itertools.chain(`
`154`		`-'MNLIJKLH',`
	`154`	`+'NMLKJIH',`
`155`	`155`	`(f"D{i}"foriinitertools.count())))`
`156`		`-text_shape=", ".join(str(n)`
`157`		`-ifnisnotNone`
`158`		`-elsenext(dim_labels)`
`159`		`-forninshape)`
	`156`	`+text_shape=", ".join([str(n)ifnisnotNoneelsenext(dim_labels)`
	`157`	`+forninshape[::-1]][::-1])`
`160`	`158`	`iflen(shape)==1:`
`161`	`159`	`text_shape+=","`
`162`	`160`

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,17 +17,19 @@`
`17`	`17`	`T=TypeVar('T')`
`18`	`18`
`19`	`19`
`20`		`-@pytest.mark.parametrize('target,test_shape',`
`21`		`- [((None, ), (1,3)),`
`22`		`- ((None,3), (1,)),`
`23`		`- ((None,3), (1,2)),`
`24`		`- ((1,5), (1,9)),`
`25`		`- ((None,2,None), (1,3,1))`
	`20`	`+@pytest.mark.parametrize('target,shape_repr,test_shape',`
	`21`	`+ [((None, ),"(N,)",(1,3)),`
	`22`	`+ ((None,3),"(N, 3)",(1,)),`
	`23`	`+ ((None,3),"(N, 3)",(1,2)),`
	`24`	`+ ((1,5),"(1, 5)",(1,9)),`
	`25`	`+ ((None,2,None),"(M, 2, N)",(1,3,1))`
`26`	`26`	`])`
`27`	`27`	`deftest_check_shape(target:tuple[int\|None, ...],`
	`28`	`+shape_repr:str,`
`28`	`29`	`test_shape:tuple[int, ...])->None:`
`29`		`-error_pattern= (f"^'aardvark' must be{len(target)}D.*"+`
`30`		`-re.escape(f'has shape{test_shape}'))`
	`30`	`+error_pattern="^"+re.escape(`
	`31`	`+f"'aardvark' must be{len(target)}D with shape{shape_repr}, but your input "`
	`32`	`+f"has shape{test_shape}")`
`31`	`33`	`data=np.zeros(test_shape)`
`32`	`34`	`withpytest.raises(ValueError,match=error_pattern):`
`33`	`35`	`_api.check_shape(target,aardvark=data)`

Comments

(0)