Commitbcce38f

authored

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

Backport PR#24343 on branch v3.6.x (Emit "axes not compatible with tight_layout" in a single place.)

2 parents634f9ed +5e1c308 commitbcce38fCopy full SHA for bcce38f

File tree

-25

lines changed

-25

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,10 @@ def get_tight_layout_figure(fig, axes_list, subplotspec_list, renderer,`
`268`	`268`	`ss_to_subplots= {ss: []forssinsubplotspec_list}`
`269`	`269`	`forax,ssinzip(axes_list,subplotspec_list):`
`270`	`270`	`ss_to_subplots[ss].append(ax)`
`271`		`-ss_to_subplots.pop(None,None)# Skip subplotspec == None.`
	`271`	`+ifss_to_subplots.pop(None,None):`
	`272`	`+_api.warn_external(`
	`273`	`+"This figure includes Axes that are not compatible with "`
	`274`	`+"tight_layout, so results might be incorrect.")`
`272`	`275`	`ifnotss_to_subplots:`
`273`	`276`	`return {}`
`274`	`277`	`subplot_list=list(ss_to_subplots.values())`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3429,12 +3429,6 @@ def tight_layout(self, *, pad=1.08, h_pad=None, w_pad=None, rect=None):`
`3429`	`3429`	`.Figure.set_layout_engine`
`3430`	`3430`	`.pyplot.tight_layout`
`3431`	`3431`	`"""`
`3432`		`-from ._tight_layoutimportget_subplotspec_list`
`3433`		`-subplotspec_list=get_subplotspec_list(self.axes)`
`3434`		`-ifNoneinsubplotspec_list:`
`3435`		`-_api.warn_external("This figure includes Axes that are not "`
`3436`		`-"compatible with tight_layout, so results "`
`3437`		`-"might be incorrect.")`
`3438`	`3432`	`# note that here we do not permanently set the figures engine to`
`3439`	`3433`	`# tight_layout but rather just perform the layout in place and remove`
`3440`	`3434`	`# any previous engines.`

Lines changed: 3 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -467,20 +467,12 @@ def tight_layout(self, figure, renderer=None,`
`467`	`467`	`coordinates that the whole subplots area (including labels) will`
`468`	`468`	`fit into. Default (None) is the whole figure.`
`469`	`469`	`"""`
`470`		`-`
`471`		`-subplotspec_list=_tight_layout.get_subplotspec_list(`
`472`		`-figure.axes,grid_spec=self)`
`473`		`-ifNoneinsubplotspec_list:`
`474`		`-_api.warn_external("This figure includes Axes that are not "`
`475`		`-"compatible with tight_layout, so results "`
`476`		`-"might be incorrect.")`
`477`		`-`
`478`	`470`	`ifrendererisNone:`
`479`	`471`	`renderer=figure._get_renderer()`
`480`		`-`
`481`	`472`	`kwargs=_tight_layout.get_tight_layout_figure(`
`482`		`-figure,figure.axes,subplotspec_list,renderer,`
`483`		`-pad=pad,h_pad=h_pad,w_pad=w_pad,rect=rect)`
	`473`	`+figure,figure.axes,`
	`474`	`+_tight_layout.get_subplotspec_list(figure.axes,grid_spec=self),`
	`475`	`+renderer,pad=pad,h_pad=h_pad,w_pad=w_pad,rect=rect)`
`484`	`476`	`ifkwargs:`
`485`	`477`	`self.update(**kwargs)`
`486`	`478`

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`fromcontextlibimportnullcontext`
`18`	`18`
`19`	`19`	`importmatplotlibasmpl`
`20`		`-importmatplotlib._apias_api`
`21`	`20`
`22`	`21`	`frommatplotlib._constrained_layoutimportdo_constrained_layout`
`23`	`22`	`frommatplotlib._tight_layoutimport (get_subplotspec_list,`
`@@ -170,15 +169,10 @@ def execute(self, fig):`
`170`	`169`	See also: `.figure.Figure.tight_layout` and `.pyplot.tight_layout`.
`171`	`170`	`"""`
`172`	`171`	`info=self._params`
`173`		`-subplotspec_list=get_subplotspec_list(fig.axes)`
`174`		`-ifNoneinsubplotspec_list:`
`175`		`-_api.warn_external("This figure includes Axes that are not "`
`176`		`-"compatible with tight_layout, so results "`
`177`		`-"might be incorrect.")`
`178`	`172`	`renderer=fig._get_renderer()`
`179`	`173`	`withgetattr(renderer,"_draw_disabled",nullcontext)():`
`180`	`174`	`kwargs=get_tight_layout_figure(`
`181`		`-fig,fig.axes,subplotspec_list,renderer,`
	`175`	`+fig,fig.axes,get_subplotspec_list(fig.axes),renderer,`
`182`	`176`	`pad=info['pad'],h_pad=info['h_pad'],w_pad=info['w_pad'],`
`183`	`177`	`rect=info['rect'])`
`184`	`178`	`ifkwargs:`

Comments

(0)