Apply code review suggestions

lschr · lschr · commit a9c45c30ee29 · 2023-05-08T11:20:56.000+02:00
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -1690,46 +1690,23 @@ def test_polygon_selector_clear_method(ax):
     onselect = mock.Mock(spec=noop, return_value=None)
     tool = widgets.PolygonSelector(ax, onselect)
 
-    event_sequence = [
-        *polygon_place_vertex(50, 50),
-        *polygon_place_vertex(150, 50),
-        *polygon_place_vertex(50, 150),
-        *polygon_place_vertex(50, 50),
-    ]
-    expected_result = [(50, 50), (150, 50), (50, 150), (50, 50)]
-
-    for (etype, event_args) in event_sequence:
-        do_event(tool, etype, **event_args)
-
-    artist = tool._selection_artist
-
-    assert tool._selection_completed
-    assert tool.get_visible()
-    assert artist.get_visible()
-    np.testing.assert_equal(artist.get_xydata(), expected_result)
-    assert onselect.call_args == ((expected_result[:-1],), {})
+    for result in ([(50, 50), (150, 50), (50, 150), (50, 50)],
+                   [(50, 50), (100, 50), (50, 150), (50, 50)]):
+        for x, y in result:
+            for etype, event_args in polygon_place_vertex(x, y):
+                do_event(tool, etype, **event_args)
 
-    tool.clear()
-    assert not tool._selection_completed
-    np.testing.assert_equal(artist.get_xydata(), [(0, 0)])
-
-    # Do another cycle of events to make sure we can
-    event_sequence = [
-        *polygon_place_vertex(50, 50),
-        *polygon_place_vertex(100, 50),
-        *polygon_place_vertex(50, 150),
-        *polygon_place_vertex(50, 50),
-    ]
-    expected_result2 = [(50, 50), (100, 50), (50, 150), (50, 50)]
+        artist = tool._selection_artist
 
-    for (etype, event_args) in event_sequence:
-        do_event(tool, etype, **event_args)
+        assert tool._selection_completed
+        assert tool.get_visible()
+        assert artist.get_visible()
+        np.testing.assert_equal(artist.get_xydata(), result)
+        assert onselect.call_args == ((result[:-1],), {})
 
-    assert tool._selection_completed
-    assert tool.get_visible()
-    assert artist.get_visible()
-    np.testing.assert_equal(artist.get_xydata(), expected_result2)
-    assert onselect.call_args == ((expected_result2[:-1],), {})
+        tool.clear()
+        assert not tool._selection_completed
+        np.testing.assert_equal(artist.get_xydata(), [(0, 0)])
 
 
 @pytest.mark.parametrize("horizOn", [False, True])
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -4142,8 +4142,7 @@ def _on_key_release(self, event):
             self.set_visible(True)
 
     def _draw_polygon_without_update(self):
-        """Redraw the polygon based on the new vertex positions, no update().
-        """
+        """Redraw the polygon based on new vertex positions, no update()."""
         xs, ys = zip(*self._xys) if self._xys else ([], [])
         self._selection_artist.set_data(xs, ys)
         self._update_box()
