Commit258dd85

authored

Merge pull request#26744 from oscargus/cbookusage

Use cbook methods for string checking

2 parents6fa5045 +a4d1f4e commit258dd85Copy full SHA for 258dd85

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2766,7 +2766,7 @@ def _auto_sized_delimiter(self, front: str,`
`2766`	`2766`	`depth=max([x.depthforxinmiddleifnotisinstance(x,str)])`
`2767`	`2767`	`factor=None`
`2768`	`2768`	`foridx,elinenumerate(middle):`
`2769`		`-ifisinstance(el,str)andel=='\\middle':`
	`2769`	`+ifel==r'\middle':`
`2770`	`2770`	`c=T.cast(str,middle[idx+1])# Should be one of p.delims.`
`2771`	`2771`	`ifc!='.':`
`2772`	`2772`	`middle[idx+1]=AutoHeightChar(`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`importnumpyasnp`
`30`	`30`
`31`	`31`	`importmatplotlibasmpl`
`32`		`-frommatplotlibimport_api,_docstring,colors,offsetbox`
	`32`	`+frommatplotlibimport_api,_docstring,cbook,colors,offsetbox`
`33`	`33`	`frommatplotlib.artistimportArtist,allow_rasterization`
`34`	`34`	`frommatplotlib.cbookimportsilent_list`
`35`	`35`	`frommatplotlib.font_managerimportFontProperties`
`@@ -622,7 +622,7 @@ def __init__(`
`622`	`622`	`break`
`623`	`623`	`exceptAttributeError:`
`624`	`624`	`pass`
`625`		`-elifisinstance(labelcolor,str)andlabelcolor=='none':`
	`625`	`+elifcbook._str_equal(labelcolor,'none'):`
`626`	`626`	`fortextinself.texts:`
`627`	`627`	`text.set_color(labelcolor)`
`628`	`628`	`elifnp.iterable(labelcolor):`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ def _make_type_validator(cls, *, allow_none=False):`
`179`	`179`
`180`	`180`	`defvalidator(s):`
`181`	`181`	`if (allow_noneand`
`182`		`- (sisNoneorisinstance(s,str)ands.lower()=="none")):`
	`182`	`+ (sisNoneorcbook._str_lower_equal(s,"none"))):`
`183`	`183`	`returnNone`
`184`	`184`	`ifclsisstrandnotisinstance(s,str):`
`185`	`185`	`raiseValueError(f'Could not convert{s!r} to str')`
`@@ -615,7 +615,7 @@ def _validate_minor_tick_ndivs(n):`
`615`	`615`	`two major ticks.`
`616`	`616`	`"""`
`617`	`617`
`618`		`-ifisinstance(n,str)andn.lower()=='auto':`
	`618`	`+ifcbook._str_lower_equal(n,'auto'):`
`619`	`619`	`returnn`
`620`	`620`	`try:`
`621`	`621`	`n=_validate_int_greaterequal0(n)`

Comments

(0)