Merge pull request #22742 from QuLogic/fix-deprecation

oscargus · web-flow · commit d8ede1a710d6 · 2022-03-31T22:52:52.000+02:00
Fix deprecation of backend_tools.ToolBase.destroy
diff --git a/lib/matplotlib/backend_managers.py b/lib/matplotlib/backend_managers.py
@@ -206,9 +206,11 @@ def remove_tool(self, name):
         """
 
         tool = self.get_tool(name)
-        _api.deprecate_method_override(
+        destroy = _api.deprecate_method_override(
             backend_tools.ToolBase.destroy, tool, since="3.6",
-            alternative="tool_removed_event")()
+            alternative="tool_removed_event")
+        if destroy is not None:
+            destroy()
 
         # If it's a toggle tool and toggled, untoggle
         if getattr(tool, 'toggled', False):
