Remove ToolManager API deprecated in 3.3.

QuLogic · QuLogic · commit 981040d114ff · 2021-06-19T04:58:47.000-04:00
diff --git a/doc/api/next_api_changes/removals/20465-ES.rst b/doc/api/next_api_changes/removals/20465-ES.rst
@@ -83,3 +83,9 @@ and ``funchspace`` methods of `.widgets.SubplotTool` have been removed.
 The ``axleft``, ``axright``, ``axbottom``, ``axtop``, ``axwspace``, and
 ``axhspace`` attributes of `.widgets.SubplotTool` have been removed.  Access
 the ``ax`` attribute of the corresponding slider, if needed.
+
+Variants on ``ToolManager.update_keymap`` calls
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Passing multiple keys as a single comma-separated string or multiple arguments
+to `.ToolManager.update_keymap` is no longer supported; pass keys as a list of
+strings instead.
diff --git a/lib/matplotlib/backend_managers.py b/lib/matplotlib/backend_managers.py
@@ -175,8 +175,7 @@ def _remove_keys(self, name):
         for k in self.get_tool_keymap(name):
             del self._keys[k]
 
-    @_api.delete_parameter("3.3", "args")
-    def update_keymap(self, name, key, *args):
+    def update_keymap(self, name, key):
         """
         Set the keymap to associate with the specified tool.
 
@@ -188,23 +187,15 @@ def update_keymap(self, name, key, *args):
             Keys to associate with the tool.
         """
         if name not in self._tools:
-            raise KeyError('%s not in Tools' % name)
+            raise KeyError(f'{name} not in Tools')
         self._remove_keys(name)
-        for key in [key, *args]:
-            if isinstance(key, str) and validate_stringlist(key) != [key]:
-                _api.warn_deprecated(
-                    "3.3", message="Passing a list of keys as a single "
-                    "comma-separated string is deprecated since %(since)s and "
-                    "support will be removed %(removal)s; pass keys as a list "
-                    "of strings instead.")
-                key = validate_stringlist(key)
-            if isinstance(key, str):
-                key = [key]
-            for k in key:
-                if k in self._keys:
-                    _api.warn_external(
-                        f'Key {k} changed from {self._keys[k]} to {name}')
-                self._keys[k] = name
+        if isinstance(key, str):
+            key = [key]
+        for k in key:
+            if k in self._keys:
+                _api.warn_external(
+                    f'Key {k} changed from {self._keys[k]} to {name}')
+            self._keys[k] = name
 
     def remove_tool(self, name):
         """
