Commit88f23d3

authored

Merge pull request#20404 from tacaswell/auto-backport-of-pr-20403-on-v3.4.x

2 parentsbc6cb1b +e1206cc commit88f23d3Copy full SHA for 88f23d3

File tree

+11

-0

lines changed

+11

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -175,13 +175,18 @@ def subplot_class_factory(axes_class=None):`
`175`	`175`	`"is deprecated since %(since)s; explicitly pass the default Axes "`
`176`	`176`	`"class instead. This will become an error %(removal)s.")`
`177`	`177`	`axes_class=Axes`
	`178`	`+`
`178`	`179`	`try:`
`179`	`180`	`# Avoid creating two different instances of GeoAxesSubplot...`
`180`	`181`	`# Only a temporary backcompat fix. This should be removed in`
`181`	`182`	`# 3.4`
`182`	`183`	`returnnext(clsforclsinSubplotBase.__subclasses__()`
`183`	`184`	`ifcls.__bases__== (SubplotBase,axes_class))`
`184`	`185`	`exceptStopIteration:`
	`186`	`+# if we have already wrapped this class, declare victory!`
	`187`	`+ifissubclass(axes_class,SubplotBase):`
	`188`	`+returnaxes_class`
	`189`	`+`
`185`	`190`	`returntype("%sSubplot"%axes_class.__name__,`
`186`	`191`	`(SubplotBase,axes_class),`
`187`	`192`	`{'_axes_class':axes_class})`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`importmatplotlib.pyplotasplt`
`7`	`7`	`frommatplotlib.testing.decoratorsimportimage_comparison`
	`8`	`+importmatplotlib.axesasmaxes`
`8`	`9`
`9`	`10`
`10`	`11`	`defcheck_shared(axs,x_shared,y_shared):`
`@@ -195,3 +196,8 @@ def test_dont_mutate_kwargs():`
`195`	`196`	`gridspec_kw=gridspec_kw)`
`196`	`197`	`assertsubplot_kw== {'sharex':'all'}`
`197`	`198`	`assertgridspec_kw== {'width_ratios': [1,2]}`
	`199`	`+`
	`200`	`+`
	`201`	`+deftest_subplot_factory_reapplication():`
	`202`	`+assertmaxes.subplot_class_factory(maxes.Axes)ismaxes.Subplot`
	`203`	`+assertmaxes.subplot_class_factory(maxes.Subplot)ismaxes.Subplot`

Comments

(0)