Merge pull request #19796 from anntzer/unall

jklymak · web-flow · commit 69294b6d5211 · 2021-03-28T10:17:57.000-07:00
Expire ``keymap.all_axes``-related deprecations.
diff --git a/doc/api/next_api_changes/removals/19796-AL.rst b/doc/api/next_api_changes/removals/19796-AL.rst
@@ -0,0 +1,3 @@
+Keymaps toggling ``Axes.get_navigate`` have been removed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This includes numeric key events and the ``keymap.all_axes`` rcParam.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -552,7 +552,6 @@ def gen_candidates():
     'animation.avconv_path': ('3.3',),
     'animation.avconv_args': ('3.3',),
     'animation.html_args': ('3.3',),
-    'keymap.all_axes': ('3.3',),
     'savefig.jpeg_quality': ('3.3',),
     'text.latex.preview': ('3.3',),
 }
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2510,7 +2510,6 @@ def key_press_handler(event, canvas=None, toolbar=None):
     grid_minor_keys = rcParams['keymap.grid_minor']
     toggle_yscale_keys = rcParams['keymap.yscale']
     toggle_xscale_keys = rcParams['keymap.xscale']
-    all_keys = dict.__getitem__(rcParams, 'keymap.all_axes')
 
     # toggle fullscreen mode ('f', 'ctrl + f')
     if event.key in fullscreen_keys:
@@ -2629,29 +2628,6 @@ def _get_uniform_gridstate(ticks):
                 _log.warning(str(exc))
                 ax.set_xscale('linear')
             ax.figure.canvas.draw_idle()
-    # enable navigation for all axes that contain the event (default key 'a')
-    elif event.key in all_keys:
-        for a in canvas.figure.get_axes():
-            if (event.x is not None and event.y is not None
-                    and a.in_axes(event)):  # FIXME: Why only these?
-                _api.warn_deprecated(
-                    "3.3", message="Toggling axes navigation from the "
-                    "keyboard is deprecated since %(since)s and will be "
-                    "removed %(removal)s.")
-                a.set_navigate(True)
-    # enable navigation only for axes with this index (if such an axes exist,
-    # otherwise do nothing)
-    elif event.key.isdigit() and event.key != '0':
-        n = int(event.key) - 1
-        if n < len(canvas.figure.get_axes()):
-            for i, a in enumerate(canvas.figure.get_axes()):
-                if (event.x is not None and event.y is not None
-                        and a.in_axes(event)):  # FIXME: Why only these?
-                    _api.warn_deprecated(
-                        "3.3", message="Toggling axes navigation from the "
-                        "keyboard is deprecated since %(since)s and will be "
-                        "removed %(removal)s.")
-                    a.set_navigate(i == n)
 
 
 def button_press_handler(event, canvas=None, toolbar=None):
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -362,36 +362,6 @@ def trigger(self, sender, event, data=None):
         Gcf.destroy_all()
 
 
-class _ToolEnableAllNavigation(ToolBase):
-    """Tool to enable all axes for toolmanager interaction."""
-
-    description = 'Enable all axes toolmanager'
-    default_keymap = mpl.rcParams['keymap.all_axes']
-
-    def trigger(self, sender, event, data=None):
-        mpl.backend_bases.key_press_handler(event, self.figure.canvas, None)
-
-
-@_api.deprecated("3.3")
-class ToolEnableAllNavigation(_ToolEnableAllNavigation):
-    pass
-
-
-class _ToolEnableNavigation(ToolBase):
-    """Tool to enable a specific axes for toolmanager interaction."""
-
-    description = 'Enable one axes toolmanager'
-    default_keymap = ('1', '2', '3', '4', '5', '6', '7', '8', '9')
-
-    def trigger(self, sender, event, data=None):
-        mpl.backend_bases.key_press_handler(event, self.figure.canvas, None)
-
-
-@_api.deprecated("3.3")
-class ToolEnableNavigation(_ToolEnableNavigation):
-    pass
-
-
 class ToolGrid(ToolBase):
     """Tool to toggle the major grids of the figure."""
 
@@ -999,8 +969,6 @@ def trigger(self, *args, **kwargs):
                  'fullscreen': ToolFullScreen,
                  'quit': ToolQuit,
                  'quit_all': ToolQuitAll,
-                 'allnav': _ToolEnableAllNavigation,
-                 'nav': _ToolEnableNavigation,
                  'xscale': ToolXScale,
                  'yscale': ToolYScale,
                  'position': ToolCursorPosition,
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -1377,7 +1377,6 @@ def _convert_validator_spec(key, conv):
     "keymap.grid_minor": validate_stringlist,
     "keymap.yscale":     validate_stringlist,
     "keymap.xscale":     validate_stringlist,
-    "keymap.all_axes":   validate_stringlist,
     "keymap.help":       validate_stringlist,
     "keymap.copy":       validate_stringlist,
 
@@ -1422,7 +1421,6 @@ def _convert_validator_spec(key, conv):
     "animation.avconv_path": "avconv",
     "animation.avconv_args": [],
     "animation.html_args": [],
-    "keymap.all_axes": ["a"],
     "savefig.jpeg_quality": 95,
     "text.latex.preview": False,
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Keymaps toggling ``Axes.get_navigate`` have been removed
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
	`3`	+This includes numeric key events and the ``keymap.all_axes`` rcParam.
Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,6 @@ def gen_candidates():`
`552`	`552`	`'animation.avconv_path': ('3.3',),`
`553`	`553`	`'animation.avconv_args': ('3.3',),`
`554`	`554`	`'animation.html_args': ('3.3',),`
`555`		`- 'keymap.all_axes': ('3.3',),`
`556`	`555`	`'savefig.jpeg_quality': ('3.3',),`
`557`	`556`	`'text.latex.preview': ('3.3',),`
`558`	`557`	`}`