Make NavigationToolbar.configure_subplots return value consistent

QuLogic · QuLogic · commit 6476ff3f6f17 · 2025-06-02T17:00:07.000-04:00
When the subplot tool already exists, then it is shown, but never
returned. This seems to be an accident.
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -3244,7 +3244,7 @@ def _update_view(self):
     def configure_subplots(self, *args):
         if hasattr(self, "subplot_tool"):
             self.subplot_tool.figure.canvas.manager.show()
-            return
+            return self.subplot_tool
         # This import needs to happen here due to circular imports.
         from matplotlib.figure import Figure
         with mpl.rc_context({"toolbar": "none"}):  # No navbar for the toolfig.
diff --git a/lib/matplotlib/backend_bases.pyi b/lib/matplotlib/backend_bases.pyi
@@ -475,7 +475,7 @@ class NavigationToolbar2:
     def release_zoom(self, event: Event) -> None: ...
     def push_current(self) -> None: ...
     subplot_tool: widgets.SubplotTool
-    def configure_subplots(self, *args): ...
+    def configure_subplots(self, *args: Any) -> widgets.SubplotTool: ...
     def save_figure(self, *args) -> str | None | object: ...
     def update(self) -> None: ...
     def set_history_buttons(self) -> None: ...
