Commit7f63a18

authored

Merge pull request#27015 from borgesaugusto/iss_27007

ValueError exception added to handle mix of {} and % string in colorbar format

2 parentscfe5bf7 +10b4157 commit7f63a18Copy full SHA for 7f63a18

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ def __init__(self, ax, mappable=None, *, cmap=None,`
`404`	`404`	`try:`
`405`	`405`	`self._formatter=ticker.FormatStrFormatter(format)`
`406`	`406`	`_=self._formatter(0)`
`407`		`-exceptTypeError:`
	`407`	`+except(TypeError,ValueError):`
`408`	`408`	`self._formatter=ticker.StrMethodFormatter(format)`
`409`	`409`	`else:`
`410`	`410`	`self._formatter=format# Assume it is a Formatter or None`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`BoundaryNorm,LogNorm,PowerNorm,Normalize,NoNorm`
`16`	`16`	`)`
`17`	`17`	`frommatplotlib.colorbarimportColorbar`
`18`		`-frommatplotlib.tickerimportFixedLocator,LogFormatter`
	`18`	`+frommatplotlib.tickerimportFixedLocator,LogFormatter,StrMethodFormatter`
`19`	`19`	`frommatplotlib.testing.decoratorsimportcheck_figures_equal`
`20`	`20`
`21`	`21`
`@@ -1230,3 +1230,9 @@ def test_colorbar_wrong_figure():`
`1230`	`1230`	`fig_tl.colorbar(im)`
`1231`	`1231`	`fig_tl.draw_without_rendering()`
`1232`	`1232`	`fig_cl.draw_without_rendering()`
	`1233`	`+`
	`1234`	`+`
	`1235`	`+deftest_colorbar_format_string_and_old():`
	`1236`	`+plt.imshow([[0,1]])`
	`1237`	`+cb=plt.colorbar(format="{x}%")`
	`1238`	`+assertisinstance(cb._formatter,StrMethodFormatter)`

Comments

(0)