Commit1188b83

authored

Merge pull request#24601 from meeseeksmachine/auto-backport-of-pr-24600-on-v3.6.x

Backport PR#24600 on branch v3.6.x (Fix: Gracefully fail the string validator for tuple inputs)

2 parents382db61 +149ab12 commit1188b83Copy full SHA for 1188b83

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ def __call__(self, s):`
`68`	`68`	`name,= (kfork,vinglobals().items()ifvisself)`
`69`	`69`	`_api.warn_deprecated(`
`70`	`70`	`self._deprecated_since,name=name,obj_type="function")`
`71`		`-ifself.ignorecase:`
	`71`	`+ifself.ignorecaseandisinstance(s,str):`
`72`	`72`	`s=s.lower()`
`73`	`73`	`ifsinself.valid:`
`74`	`74`	`returnself.valid[s]`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`importcopy`
`2`	`2`	`importos`
`3`	`3`	`frompathlibimportPath`
	`4`	`+importre`
`4`	`5`	`importsubprocess`
`5`	`6`	`importsys`
`6`	`7`	`fromunittestimportmock`
`@@ -591,3 +592,10 @@ def test_deprecation(monkeypatch):`
`591`	`592`	`# Note that the warning suppression actually arises from the`
`592`	`593`	`# iteration over the updater rcParams being protected by`
`593`	`594`	`# suppress_matplotlib_deprecation_warning, rather than any explicit check.`
	`595`	`+`
	`596`	`+`
	`597`	`+deftest_rcparams_legend_loc():`
	`598`	`+value= (0.9,.7)`
	`599`	`+match_str=f"{value} is not a valid value for legend.loc;"`
	`600`	`+withpytest.raises(ValueError,match=re.escape(match_str)):`
	`601`	`+mpl.RcParams({'legend.loc':value})`

Comments

(0)