Simplify reset _selection_completed after clearing selector and fix it for all selector

ericpre · ericpre · commit 96f6c903ef2e · 2021-08-25T09:51:45.000+01:00
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -460,13 +460,18 @@ def onselect(epress, erelease):
         assert artist.get_alpha() == 0.3
 
 
-def test_span_selector_clear():
+@pytest.mark.parametrize('selector', ['span', 'rectangle'])
+def test_selector_clear(selector):
     ax = get_ax()
 
     def onselect(*args):
         pass
 
-    tool = widgets.SpanSelector(ax, onselect, 'horizontal', interactive=True)
+    if selector == 'span':
+        tool = widgets.SpanSelector(ax, onselect, 'horizontal',
+                                    interactive=True)
+    else:
+        tool = widgets.RectangleSelector(ax, onselect, interactive=True)
     do_event(tool, 'press', xdata=10, ydata=10, button=1)
     do_event(tool, 'onmove', xdata=100, ydata=120, button=1)
     do_event(tool, 'release', xdata=100, ydata=120, button=1)
@@ -486,7 +491,6 @@ def onselect(*args):
     do_event(tool, 'press', xdata=130, ydata=130, button=1)
     do_event(tool, 'release', xdata=130, ydata=130, button=1)
     assert tool._selection_completed
-    assert tool.extents == (10, 100)
 
     do_event(tool, 'on_key_press', key='escape')
     assert not tool._selection_completed
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1978,9 +1978,11 @@ def on_key_press(self, event):
             key = event.key or ''
             key = key.replace('ctrl', 'control')
             if key == self.state_modifier_keys['clear']:
+                self._selection_completed = False
                 for artist in self.artists:
                     artist.set_visible(False)
                 self.update()
+                return
             for (state, modifier) in self.state_modifier_keys.items():
                 if modifier in key:
                     self._state.add(state)
@@ -2315,11 +2317,6 @@ def direction(self, direction):
         else:
             self._direction = direction
 
-    def _on_key_press(self, event):
-        key = event.key or ''
-        if key == self.state_modifier_keys['clear']:
-            self._selection_completed = False
-
     def _release(self, event):
         """Button release event handler."""
         self._set_cursor(False)
