Deprecate access to Cursor/MultiCursor event handlers.

QuLogic · QuLogic · commit 83b1cfdeb742 · 2021-03-24T04:18:20.000-04:00
diff --git a/doc/api/next_api_changes/deprecations/19763-ES.rst b/doc/api/next_api_changes/deprecations/19763-ES.rst
@@ -0,0 +1,5 @@
+``Cursor`` and ``MultiCursor`` event handlers are now private
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Access to the event handlers for the `.Cursor` and `.MultiCursor` widgets is
+now deprecated.
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -484,7 +484,7 @@ def test_MultiCursor(horizOn, vertOn):
     # Can't use `do_event` as that helper requires the widget
     # to have a single .ax attribute.
     event = mock_event(ax1, xdata=.5, ydata=.25)
-    multi.onmove(event)
+    multi._onmove(event)
 
     # the lines in the first two ax should both move
     for l in multi.vlines:
@@ -495,7 +495,7 @@ def test_MultiCursor(horizOn, vertOn):
     # test a move event in an axes not part of the MultiCursor
     # the lines in ax1 and ax2 should not have moved.
     event = mock_event(ax3, xdata=.75, ydata=.75)
-    multi.onmove(event)
+    multi._onmove(event)
     for l in multi.vlines:
         assert l.get_xdata() == (.5, .5)
     for l in multi.hlines:
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1509,8 +1509,8 @@ def __init__(self, ax, horizOn=True, vertOn=True, useblit=False,
                  **lineprops):
         super().__init__(ax)
 
-        self.connect_event('motion_notify_event', self.onmove)
-        self.connect_event('draw_event', self.clear)
+        self.connect_event('motion_notify_event', self._onmove)
+        self.connect_event('draw_event', self._clear)
 
         self.visible = True
         self.horizOn = horizOn
@@ -1525,7 +1525,9 @@ def __init__(self, ax, horizOn=True, vertOn=True, useblit=False,
         self.background = None
         self.needclear = False
 
-    def clear(self, event):
+    clear = _api.deprecate_privatize_attribute('3.5')
+
+    def _clear(self, event):
         """Internal event handler to clear the cursor."""
         if self.ignore(event):
             return
@@ -1534,7 +1536,9 @@ def clear(self, event):
         self.linev.set_visible(False)
         self.lineh.set_visible(False)
 
-    def onmove(self, event):
+    onmove = _api.deprecate_privatize_attribute('3.5')
+
+    def _onmove(self, event):
         """Internal event handler to draw the cursor when the mouse moves."""
         if self.ignore(event):
             return
@@ -1632,15 +1636,17 @@ def __init__(self, canvas, axes, useblit=True, horizOn=False, vertOn=True,
     def connect(self):
         """Connect events."""
         self._cidmotion = self.canvas.mpl_connect('motion_notify_event',
-                                                  self.onmove)
-        self._ciddraw = self.canvas.mpl_connect('draw_event', self.clear)
+                                                  self._onmove)
+        self._ciddraw = self.canvas.mpl_connect('draw_event', self._clear)
 
     def disconnect(self):
         """Disconnect events."""
         self.canvas.mpl_disconnect(self._cidmotion)
         self.canvas.mpl_disconnect(self._ciddraw)
 
-    def clear(self, event):
+    clear = _api.deprecate_privatize_attribute('3.5')
+
+    def _clear(self, event):
         """Clear the cursor."""
         if self.ignore(event):
             return
@@ -1650,7 +1656,9 @@ def clear(self, event):
         for line in self.vlines + self.hlines:
             line.set_visible(False)
 
-    def onmove(self, event):
+    onmove = _api.deprecate_privatize_attribute('3.5')
+
+    def _onmove(self, event):
         if self.ignore(event):
             return
         if event.inaxes not in self.axes:
