Revert: Deprecate access to Cursor/MultiCursor event handlers.

Author: ksunden

lib/matplotlib/tests/test_widgets.py

@@ -1654,7 +1654,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:
@@ -1680,7 +1680,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:

lib/matplotlib/widgets.py

@@ -1953,8 +1953,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
@@ -1967,29 +1967,18 @@ def __init__(self, ax, horizOn=True, vertOn=True, useblit=False,
         self.linev = ax.axvline(ax.get_xbound()[0], visible=False, **lineprops)
 
         self.background = None
-        self._needclear = False
-
-    needclear = _api.deprecate_privatize_attribute("3.7")
+        self.needclear = False
 
-    @_api.deprecated('3.5')
     def clear(self, event):
-        """Internal event handler to clear the cursor."""
-        self._clear(event)
-        if self.ignore(event):
-            return
-        self.linev.set_visible(False)
-        self.lineh.set_visible(False)
-
-    def _clear(self, event):
         """Internal event handler to clear the cursor."""
         if self.ignore(event):
             return
         if self.useblit:
             self.background = self.canvas.copy_from_bbox(self.ax.bbox)
+        self.linev.set_visible(False)
+        self.lineh.set_visible(False)
 
-    onmove = _api.deprecate_privatize_attribute('3.5')
-
-    def _onmove(self, event):
+    def onmove(self, event):
         """Internal event handler to draw the cursor when the mouse moves."""
         if self.ignore(event):
             return
@@ -1999,11 +1988,11 @@ def _onmove(self, event):
             self.linev.set_visible(False)
             self.lineh.set_visible(False)
 
-            if self._needclear:
+            if self.needclear:
                 self.canvas.draw()
-                self._needclear = False
+                self.needclear = False
             return
-        self._needclear = True
+        self.needclear = True
 
         self.linev.set_xdata((event.xdata, event.xdata))
         self.linev.set_visible(self.visible and self.vertOn)
@@ -2106,8 +2095,8 @@ def connect(self):
         """Connect events."""
         for canvas, info in self._canvas_infos.items():
             info["cids"] = [
-                canvas.mpl_connect('motion_notify_event', self._onmove),
-                canvas.mpl_connect('draw_event', self._clear),
+                canvas.mpl_connect('motion_notify_event', self.onmove),
+                canvas.mpl_connect('draw_event', self.clear),
             ]
 
     def disconnect(self):
@@ -2117,26 +2106,17 @@ def disconnect(self):
                 canvas.mpl_disconnect(cid)
             info["cids"].clear()
 
-    @_api.deprecated('3.5')
     def clear(self, event):
-        """Clear the cursor."""
-        if self.ignore(event):
-            return
-        self._clear(event)
-        for line in self.vlines + self.hlines:
-            line.set_visible(False)
-
-    def _clear(self, event):
         """Clear the cursor."""
         if self.ignore(event):
             return
         if self.useblit:
             for canvas, info in self._canvas_infos.items():
                 info["background"] = canvas.copy_from_bbox(canvas.figure.bbox)
+        for line in self.vlines + self.hlines:
+            line.set_visible(False)
 
-    onmove = _api.deprecate_privatize_attribute('3.5')
-
-    def _onmove(self, event):
+    def onmove(self, event):
         if (self.ignore(event)
                 or event.inaxes not in self.axes
                 or not event.canvas.widgetlock.available(self)):