Commiteef76b1

committed

Make NavigationToolbar.configure_subplots return value consistent

When the subplot tool already exists, then it is shown, but neverreturned. This seems to be an accident.

1 parent9120862 commiteef76b1Copy full SHA for eef76b1

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3244,7 +3244,7 @@ def _update_view(self):`
`3244`	`3244`	`defconfigure_subplots(self,*args):`
`3245`	`3245`	`ifhasattr(self,"subplot_tool"):`
`3246`	`3246`	`self.subplot_tool.figure.canvas.manager.show()`
`3247`		`-return`
	`3247`	`+returnself.subplot_tool`
`3248`	`3248`	`# This import needs to happen here due to circular imports.`
`3249`	`3249`	`frommatplotlib.figureimportFigure`
`3250`	`3250`	`withmpl.rc_context({"toolbar":"none"}):# No navbar for the toolfig.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ class NavigationToolbar2:`
`475`	`475`	`defrelease_zoom(self,event:Event)->None: ...`
`476`	`476`	`defpush_current(self)->None: ...`
`477`	`477`	`subplot_tool:widgets.SubplotTool`
`478`		`-defconfigure_subplots(self,*args): ...`
	`478`	`+defconfigure_subplots(self,*args:Any)->widgets.SubplotTool: ...`
`479`	`479`	`defsave_figure(self,*args)->str\|None\|object: ...`
`480`	`480`	`defupdate(self)->None: ...`
`481`	`481`	`defset_history_buttons(self)->None: ...`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,9 @@ def set_device_pixel_ratio(ratio):`
`213`	`213`	`deftest_subplottool():`
`214`	`214`	`fig,ax=plt.subplots()`
`215`	`215`	`withmock.patch("matplotlib.backends.qt_compat._exec",lambdaobj:None):`
`216`		`-fig.canvas.manager.toolbar.configure_subplots()`
	`216`	`+tool=fig.canvas.manager.toolbar.configure_subplots()`
	`217`	`+asserttoolisnotNone`
	`218`	`+asserttool==fig.canvas.manager.toolbar.configure_subplots()`
`217`	`219`
`218`	`220`
`219`	`221`	`@pytest.mark.backend('QtAgg',skip_on_importerror=True)`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,9 @@ def test_never_update():`
`168`	`168`	`plt.show(block=False)`
`169`	`169`
`170`	`170`	`plt.draw()# Test FigureCanvasTkAgg.`
`171`		`-fig.canvas.toolbar.configure_subplots()# Test NavigationToolbar2Tk.`
	`171`	`+tool=fig.canvas.toolbar.configure_subplots()# Test NavigationToolbar2Tk.`
	`172`	`+asserttoolisnotNone`
	`173`	`+asserttool==fig.canvas.toolbar.configure_subplots()# Tool is reused internally.`
`172`	`174`	`# Test FigureCanvasTk filter_destroy callback`
`173`	`175`	`fig.canvas.get_tk_widget().after(100,plt.close,fig)`
`174`	`176`

Comments

(0)