Merge pull request #630 from astrofrog/fix-deprecated-do-event

Avoid using deprecated do_event in tests

Author: larrybradley

regions/shapes/tests/test_ellipse.py

@@ -114,7 +114,6 @@ def test_region_bbox_zero_size(self):
     def test_as_mpl_selector(self, sync):
 
         plt = pytest.importorskip('matplotlib.pyplot')
-        from matplotlib.testing.widgets import do_event
 
         rng = np.random.default_rng(0)
         data = rng.random((16, 16))
@@ -136,12 +135,20 @@ def update_mask(reg):
 
         region = self.reg.copy(angle=0 * u.deg)
 
-        selector = region.as_mpl_selector(ax, callback=update_mask, sync=sync)
+        selector = region.as_mpl_selector(ax, callback=update_mask, sync=sync)  # noqa: F841
 
-        do_event(selector, 'press', xdata=7.3, ydata=4.4, button=1)
-        do_event(selector, 'onmove', xdata=9.3, ydata=5.4, button=1)
-        do_event(selector, 'release', xdata=9.3, ydata=5.4, button=1)
+        from matplotlib.backend_bases import MouseEvent
+        canvas = ax.figure.canvas
 
+        evt = MouseEvent('button_press_event', canvas,
+                         *ax.transData.transform((7.3, 4.4)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('motion_notify_event', canvas,
+                         *ax.transData.transform((9.3, 5.4)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('button_release_event', canvas,
+                         *ax.transData.transform((9.3, 5.4)), button=1)
+        canvas.callbacks.process(evt.name, evt)
         ax.figure.canvas.draw()
 
         if sync:
@@ -173,7 +180,6 @@ def test_mpl_selector_drag(self, anywhere):
         Test dragging of entire region from central handle and anywhere.
         """
         plt = pytest.importorskip('matplotlib.pyplot')
-        from matplotlib.testing.widgets import do_event
 
         rng = np.random.default_rng(0)
         data = rng.random((16, 16))
@@ -193,21 +199,35 @@ def update_mask(reg):
         assert region._mpl_selector.drag_from_anywhere is anywhere
 
         # click_and_drag(selector, start=(3, 4), end=(3.5, 4.5))
-        do_event(selector, 'press', xdata=3, ydata=4, button=1)
-        do_event(selector, 'onmove', xdata=3.5, ydata=4.5, button=1)
-        do_event(selector, 'release', xdata=3.5, ydata=4.5, button=1)
 
+        from matplotlib.backend_bases import MouseEvent
+        canvas = ax.figure.canvas
+
+        evt = MouseEvent('button_press_event', canvas,
+                         *ax.transData.transform((3, 4)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('motion_notify_event', canvas,
+                         *ax.transData.transform((3.5, 4.5)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('button_release_event', canvas,
+                         *ax.transData.transform((3.5, 4.5)), button=1)
+        canvas.callbacks.process(evt.name, evt)
         ax.figure.canvas.draw()
 
         assert_allclose(region.center.x, 3.5)
         assert_allclose(region.center.y, 4.5)
         assert_allclose(region.width, 4)
         assert_allclose(region.height, 3)
 
-        do_event(selector, 'press', xdata=3.25, ydata=4.25, button=1)
-        do_event(selector, 'onmove', xdata=4.25, ydata=5.25, button=1)
-        do_event(selector, 'release', xdata=4.25, ydata=5.25, button=1)
-
+        evt = MouseEvent('button_press_event', canvas,
+                         *ax.transData.transform((3.25, 4.25)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('motion_notify_event', canvas,
+                         *ax.transData.transform((4.25, 5.25)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('button_release_event', canvas,
+                         *ax.transData.transform((4.25, 5.25)), button=1)
+        canvas.callbacks.process(evt.name, evt)
         ax.figure.canvas.draw()
 
         # For drag_from_anywhere=False this will have created a new 1x1 rectangle.

regions/shapes/tests/test_rectangle.py

@@ -120,7 +120,6 @@ def test_eq(self):
     @pytest.mark.parametrize('sync', (False,))
     def test_as_mpl_selector(self, sync):
         plt = pytest.importorskip('matplotlib.pyplot')
-        from matplotlib.testing.widgets import do_event
 
         rng = np.random.default_rng(0)
         data = rng.random((16, 16))
@@ -142,12 +141,20 @@ def update_mask(reg):
 
         region = self.reg.copy(angle=0 * u.deg)
 
-        selector = region.as_mpl_selector(ax, callback=update_mask, sync=sync)
+        selector = region.as_mpl_selector(ax, callback=update_mask, sync=sync)  # noqa: F841
 
-        do_event(selector, 'press', xdata=7.3, ydata=4.4, button=1)
-        do_event(selector, 'onmove', xdata=9.3, ydata=5.4, button=1)
-        do_event(selector, 'release', xdata=9.3, ydata=5.4, button=1)
+        from matplotlib.backend_bases import MouseEvent
+        canvas = ax.figure.canvas
 
+        evt = MouseEvent('button_press_event', canvas,
+                         *ax.transData.transform((7.3, 4.4)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('motion_notify_event', canvas,
+                         *ax.transData.transform((9.3, 5.4)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('button_release_event', canvas,
+                         *ax.transData.transform((9.3, 5.4)), button=1)
+        canvas.callbacks.process(evt.name, evt)
         ax.figure.canvas.draw()
 
         if sync:
@@ -177,8 +184,6 @@ def test_mpl_selector_drag(self, anywhere):
         Test dragging of entire region from central handle and anywhere.
         """
         plt = pytest.importorskip('matplotlib.pyplot')
-        from matplotlib.testing.widgets import (
-            do_event)  # click_and_drag  # MPL_VERSION >= 36
 
         rng = np.random.default_rng(0)
         data = rng.random((16, 16))
@@ -198,21 +203,35 @@ def update_mask(reg):
         assert region._mpl_selector.drag_from_anywhere is anywhere
 
         # click_and_drag(selector, start=(3, 4), end=(3.5, 4.5))
-        do_event(selector, 'press', xdata=3, ydata=4, button=1)
-        do_event(selector, 'onmove', xdata=3.5, ydata=4.5, button=1)
-        do_event(selector, 'release', xdata=3.5, ydata=4.5, button=1)
 
+        from matplotlib.backend_bases import MouseEvent
+        canvas = ax.figure.canvas
+
+        evt = MouseEvent('button_press_event', canvas,
+                         *ax.transData.transform((3, 4)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('motion_notify_event', canvas,
+                         *ax.transData.transform((3.5, 4.5)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('button_release_event', canvas,
+                         *ax.transData.transform((3.5, 4.5)), button=1)
+        canvas.callbacks.process(evt.name, evt)
         ax.figure.canvas.draw()
 
         assert_allclose(region.center.x, 3.5)
         assert_allclose(region.center.y, 4.5)
         assert_allclose(region.width, 4)
         assert_allclose(region.height, 3)
 
-        do_event(selector, 'press', xdata=3.25, ydata=4.25, button=1)
-        do_event(selector, 'onmove', xdata=4.25, ydata=5.25, button=1)
-        do_event(selector, 'release', xdata=4.25, ydata=5.25, button=1)
-
+        evt = MouseEvent('button_press_event', canvas,
+                         *ax.transData.transform((3.25, 4.25)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('motion_notify_event', canvas,
+                         *ax.transData.transform((4.25, 5.25)), button=1)
+        canvas.callbacks.process(evt.name, evt)
+        evt = MouseEvent('button_release_event', canvas,
+                         *ax.transData.transform((4.25, 5.25)), button=1)
+        canvas.callbacks.process(evt.name, evt)
         ax.figure.canvas.draw()
 
         # For drag_from_anywhere=False this will have created a new 1x1 rectangle.