Use iterable unpacking for widget test event sequences

Author: QuLogic

lib/matplotlib/tests/test_widgets.py

@@ -1249,96 +1249,110 @@ def test_polygon_selector(draw_bounding_box):
 
     # Simple polygon
     expected_result = [(50, 50), (150, 50), (50, 150)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50))
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+    ]
     check_selector(event_sequence, expected_result, 1)
 
     # Move first vertex before completing the polygon.
     expected_result = [(75, 50), (150, 50), (50, 150)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + [('on_key_press', dict(key='control')),
-                         ('onmove', dict(xdata=50, ydata=50)),
-                         ('press', dict(xdata=50, ydata=50)),
-                         ('onmove', dict(xdata=75, ydata=50)),
-                         ('release', dict(xdata=75, ydata=50)),
-                         ('on_key_release', dict(key='control'))]
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(75, 50))
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        ('on_key_press', dict(key='control')),
+        ('onmove', dict(xdata=50, ydata=50)),
+        ('press', dict(xdata=50, ydata=50)),
+        ('onmove', dict(xdata=75, ydata=50)),
+        ('release', dict(xdata=75, ydata=50)),
+        ('on_key_release', dict(key='control')),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(75, 50),
+    ]
     check_selector(event_sequence, expected_result, 1)
 
     # Move first two vertices at once before completing the polygon.
     expected_result = [(50, 75), (150, 75), (50, 150)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + [('on_key_press', dict(key='shift')),
-                         ('onmove', dict(xdata=100, ydata=100)),
-                         ('press', dict(xdata=100, ydata=100)),
-                         ('onmove', dict(xdata=100, ydata=125)),
-                         ('release', dict(xdata=100, ydata=125)),
-                         ('on_key_release', dict(key='shift'))]
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 75))
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        ('on_key_press', dict(key='shift')),
+        ('onmove', dict(xdata=100, ydata=100)),
+        ('press', dict(xdata=100, ydata=100)),
+        ('onmove', dict(xdata=100, ydata=125)),
+        ('release', dict(xdata=100, ydata=125)),
+        ('on_key_release', dict(key='shift')),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 75),
+    ]
     check_selector(event_sequence, expected_result, 1)
 
     # Move first vertex after completing the polygon.
     expected_result = [(75, 50), (150, 50), (50, 150)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50)
-                      + [('onmove', dict(xdata=50, ydata=50)),
-                         ('press', dict(xdata=50, ydata=50)),
-                         ('onmove', dict(xdata=75, ydata=50)),
-                         ('release', dict(xdata=75, ydata=50))])
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+        ('onmove', dict(xdata=50, ydata=50)),
+        ('press', dict(xdata=50, ydata=50)),
+        ('onmove', dict(xdata=75, ydata=50)),
+        ('release', dict(xdata=75, ydata=50)),
+    ]
     check_selector(event_sequence, expected_result, 2)
 
     # Move all vertices after completing the polygon.
     expected_result = [(75, 75), (175, 75), (75, 175)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50)
-                      + [('on_key_press', dict(key='shift')),
-                         ('onmove', dict(xdata=100, ydata=100)),
-                         ('press', dict(xdata=100, ydata=100)),
-                         ('onmove', dict(xdata=125, ydata=125)),
-                         ('release', dict(xdata=125, ydata=125)),
-                         ('on_key_release', dict(key='shift'))])
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+        ('on_key_press', dict(key='shift')),
+        ('onmove', dict(xdata=100, ydata=100)),
+        ('press', dict(xdata=100, ydata=100)),
+        ('onmove', dict(xdata=125, ydata=125)),
+        ('release', dict(xdata=125, ydata=125)),
+        ('on_key_release', dict(key='shift')),
+    ]
     check_selector(event_sequence, expected_result, 2)
 
     # Try to move a vertex and move all before placing any vertices.
     expected_result = [(50, 50), (150, 50), (50, 150)]
-    event_sequence = ([('on_key_press', dict(key='control')),
-                       ('onmove', dict(xdata=100, ydata=100)),
-                       ('press', dict(xdata=100, ydata=100)),
-                       ('onmove', dict(xdata=125, ydata=125)),
-                       ('release', dict(xdata=125, ydata=125)),
-                       ('on_key_release', dict(key='control')),
-                       ('on_key_press', dict(key='shift')),
-                       ('onmove', dict(xdata=100, ydata=100)),
-                       ('press', dict(xdata=100, ydata=100)),
-                       ('onmove', dict(xdata=125, ydata=125)),
-                       ('release', dict(xdata=125, ydata=125)),
-                       ('on_key_release', dict(key='shift'))]
-                      + polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50))
+    event_sequence = [
+        ('on_key_press', dict(key='control')),
+        ('onmove', dict(xdata=100, ydata=100)),
+        ('press', dict(xdata=100, ydata=100)),
+        ('onmove', dict(xdata=125, ydata=125)),
+        ('release', dict(xdata=125, ydata=125)),
+        ('on_key_release', dict(key='control')),
+        ('on_key_press', dict(key='shift')),
+        ('onmove', dict(xdata=100, ydata=100)),
+        ('press', dict(xdata=100, ydata=100)),
+        ('onmove', dict(xdata=125, ydata=125)),
+        ('release', dict(xdata=125, ydata=125)),
+        ('on_key_release', dict(key='shift')),
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+    ]
     check_selector(event_sequence, expected_result, 1)
 
     # Try to place vertex out-of-bounds, then reset, and start a new polygon.
     expected_result = [(50, 50), (150, 50), (50, 150)]
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(250, 50)
-                      + [('on_key_press', dict(key='escape')),
-                         ('on_key_release', dict(key='escape'))]
-                      + polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50))
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(250, 50),
+        ('on_key_press', dict(key='escape')),
+        ('on_key_release', dict(key='escape')),
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+    ]
     check_selector(event_sequence, expected_result, 1)
 
 
@@ -1355,10 +1369,12 @@ def onselect(vertices):
                                    handle_props=dict(alpha=0.5),
                                    draw_bounding_box=draw_bounding_box)
 
-    event_sequence = (polygon_place_vertex(50, 50)
-                      + polygon_place_vertex(150, 50)
-                      + polygon_place_vertex(50, 150)
-                      + polygon_place_vertex(50, 50))
+    event_sequence = [
+        *polygon_place_vertex(50, 50),
+        *polygon_place_vertex(150, 50),
+        *polygon_place_vertex(50, 150),
+        *polygon_place_vertex(50, 50),
+    ]
 
     for (etype, event_args) in event_sequence:
         do_event(tool, etype, **event_args)
@@ -1413,28 +1429,31 @@ def test_polygon_selector_remove(idx, draw_bounding_box):
 @pytest.mark.parametrize('draw_bounding_box', [False, True])
 def test_polygon_selector_remove_first_point(draw_bounding_box):
     verts = [(50, 50), (150, 50), (50, 150)]
-    event_sequence = (polygon_place_vertex(*verts[0]) +
-                      polygon_place_vertex(*verts[1]) +
-                      polygon_place_vertex(*verts[2]) +
-                      polygon_place_vertex(*verts[0]) +
-                      polygon_remove_vertex(*verts[0]))
+    event_sequence = [
+        *polygon_place_vertex(*verts[0]),
+        *polygon_place_vertex(*verts[1]),
+        *polygon_place_vertex(*verts[2]),
+        *polygon_place_vertex(*verts[0]),
+        *polygon_remove_vertex(*verts[0]),
+    ]
     check_polygon_selector(event_sequence, verts[1:], 2,
                            draw_bounding_box=draw_bounding_box)
 
 
 @pytest.mark.parametrize('draw_bounding_box', [False, True])
 def test_polygon_selector_redraw(ax, draw_bounding_box):
     verts = [(50, 50), (150, 50), (50, 150)]
-    event_sequence = (polygon_place_vertex(*verts[0]) +
-                      polygon_place_vertex(*verts[1]) +
-                      polygon_place_vertex(*verts[2]) +
-                      polygon_place_vertex(*verts[0]) +
-                      # Polygon completed, now remove first two verts
-                      polygon_remove_vertex(*verts[1]) +
-                      polygon_remove_vertex(*verts[2]) +
-                      # At this point the tool should be reset so we can add
-                      # more vertices
-                      polygon_place_vertex(*verts[1]))
+    event_sequence = [
+        *polygon_place_vertex(*verts[0]),
+        *polygon_place_vertex(*verts[1]),
+        *polygon_place_vertex(*verts[2]),
+        *polygon_place_vertex(*verts[0]),
+        # Polygon completed, now remove first two verts.
+        *polygon_remove_vertex(*verts[1]),
+        *polygon_remove_vertex(*verts[2]),
+        # At this point the tool should be reset so we can add more vertices.
+        *polygon_place_vertex(*verts[1]),
+    ]
 
     tool = widgets.PolygonSelector(ax, onselect=noop,
                                    draw_bounding_box=draw_bounding_box)
@@ -1459,22 +1478,26 @@ def test_polygon_selector_verts_setter(fig_test, fig_ref, draw_bounding_box):
     ax_ref = fig_ref.add_subplot()
     tool_ref = widgets.PolygonSelector(
         ax_ref, onselect=noop, draw_bounding_box=draw_bounding_box)
-    event_sequence = (polygon_place_vertex(*verts[0]) +
-                      polygon_place_vertex(*verts[1]) +
-                      polygon_place_vertex(*verts[2]) +
-                      polygon_place_vertex(*verts[0]))
+    event_sequence = [
+        *polygon_place_vertex(*verts[0]),
+        *polygon_place_vertex(*verts[1]),
+        *polygon_place_vertex(*verts[2]),
+        *polygon_place_vertex(*verts[0]),
+    ]
     for (etype, event_args) in event_sequence:
         do_event(tool_ref, etype, **event_args)
 
 
 def test_polygon_selector_box(ax):
     # Create a diamond shape
     verts = [(20, 0), (0, 20), (20, 40), (40, 20)]
-    event_sequence = (polygon_place_vertex(*verts[0]) +
-                      polygon_place_vertex(*verts[1]) +
-                      polygon_place_vertex(*verts[2]) +
-                      polygon_place_vertex(*verts[3]) +
-                      polygon_place_vertex(*verts[0]))
+    event_sequence = [
+        *polygon_place_vertex(*verts[0]),
+        *polygon_place_vertex(*verts[1]),
+        *polygon_place_vertex(*verts[2]),
+        *polygon_place_vertex(*verts[3]),
+        *polygon_place_vertex(*verts[0]),
+    ]
 
     # Create selector
     tool = widgets.PolygonSelector(ax, onselect=noop, draw_bounding_box=True)