Preserve existing api for event handler functions

blink1073 · blink1073 · commit a2e49365e085 · 2014-12-21T17:31:43.000-06:00
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -72,7 +72,7 @@ def do_event(tool, etype, button=1, xdata=0, ydata=0, key=None, step=1):
     event.guiEvent = None
     event.name = 'Custom'
 
-    func = getattr(tool, '_%s' % etype)
+    func = getattr(tool, etype)
     func(event)
 
 
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1103,11 +1103,11 @@ def __init__(self, ax, onselect, useblit=False, button=None):
 
         self.visible = True
         self.onselect = onselect
+        self.useblit = useblit and self.canvas.supports_blit
         self.connect_default_events()
 
         self.background = None
         self.artists = []
-        self.useblit = useblit and self.canvas.supports_blit
 
         if isinstance(button, int):
             self.validButtons = [button]
@@ -1135,13 +1135,13 @@ def update_background(self, event):
 
     def connect_default_events(self):
         """Connect the major canvas events to methods."""
-        self.connect_event('motion_notify_event', self._onmove)
-        self.connect_event('button_press_event', self._press)
-        self.connect_event('button_release_event', self._release)
+        self.connect_event('motion_notify_event', self.onmove)
+        self.connect_event('button_press_event', self.press)
+        self.connect_event('button_release_event', self.release)
         self.connect_event('draw_event', self.update_background)
-        self.connect_event('key_press_event', self._on_key_press)
-        self.connect_event('key_release_event', self._on_key_release)
-        self.connect_event('scroll_event', self._on_scroll)
+        self.connect_event('key_press_event', self.on_key_press)
+        self.connect_event('key_release_event', self.on_key_release)
+        self.connect_event('scroll_event', self.on_scroll)
 
     def ignore(self, event):
         """return *True* if *event* should be ignored"""
@@ -1221,7 +1221,7 @@ def _clean_event(self, event):
         self._prev_event = event
         return event
 
-    def _press(self, event):
+    def press(self, event):
         """Button press handler and validator"""
         if not self.ignore(event):
             event = self._clean_event(event)
@@ -1230,68 +1230,68 @@ def _press(self, event):
             key = event.key or ''
             if 'alt' in key or key == ' ':
                 self.state.add('move')
-            self.press(event)
+            self._press(event)
 
-    def press(self, event):
+    def _press(self, event):
         """Button press handler"""
         pass
 
-    def _release(self, event):
+    def release(self, event):
         """Button release event handler and validator"""
         if not self.ignore(event) and self.eventpress:
             event = self._clean_event(event)
             self.eventrelease = event
-            self.release(event)
+            self._release(event)
             self.state.discard('move')
 
-    def release(self, event):
+    def _release(self, event):
         """Button release event handler"""
         pass
             
-    def _onmove(self, event):
+    def onmove(self, event):
         """Cursor move event handler and validator"""
         if not self.ignore(event) and self.eventpress:
             event = self._clean_event(event)
-            self.onmove(event)
+            self._onmove(event)
 
-    def onmove(self, event):
+    def _onmove(self, event):
         """Cursor move event handler"""
         pass
 
-    def _on_scroll(self, event):
+    def on_scroll(self, event):
         """Mouse scroll event handler and validator"""
         if not self.ignore(event):
-            self.on_scroll(event)
+            self._on_scroll(event)
 
-    def on_scroll(self, event):
+    def _on_scroll(self, event):
         """Mouse scroll event handler"""
         pass
 
-    def _on_key_press(self, event):
+    def on_key_press(self, event):
         """Key press event handler and validator"""
         if self.active:
             key = event.key or ''
             if 'shift' in key:
                 self.state.add('square')
             if 'ctrl' in key or 'control' in key:
                 self.state.add('center')
-            self.on_key_press(event)
+            self._on_key_press(event)
 
-    def on_key_press(self, event):
+    def _on_key_press(self, event):
         """Key press event handler"""
         pass
 
-    def _on_key_release(self, event):
+    def on_key_release(self, event):
         """Key release event handler and validator"""
         if self.active:
             key = event.key or ''
             if 'shift' in key:
                 self.state.discard('square')
             if 'ctrl' in key or 'control' in key:
                 self.state.discard('center')
-            self.on_key_release(event)
+            self._on_key_release(event)
 
-    def on_key_release(self, event):
+    def _on_key_release(self, event):
         """Key release event handler"""
         pass
 
@@ -1419,7 +1419,7 @@ def ignore(self, event):
         """return *True* if *event* should be ignored"""
         return _SelectorWidget.ignore(self, event) or not self.visible
 
-    def press(self, event):
+    def _press(self, event):
         """on button press event"""
         self.rect.set_visible(self.visible)
         if self.span_stays:
@@ -1432,7 +1432,7 @@ def press(self, event):
             self.pressv = ydata
         return False
 
-    def release(self, event):
+    def _release(self, event):
         """on button release event"""
         if self.pressv is None:
             return
@@ -1464,7 +1464,7 @@ def release(self, event):
         self.pressv = None
         return False
 
-    def onmove(self, event):
+    def _onmove(self, event):
         """on motion notify event"""
         if self.pressv is None:
             return
@@ -1711,7 +1711,7 @@ def __init__(self, ax, onselect, drawtype='patch',
                         self._corner_handles.artist,
                         self._edge_handles.artist]
 
-    def press(self, event):
+    def _press(self, event):
         """on button press event"""
         # make the drawed box/line visible get the click-coordinates,
         # button, ...
@@ -1724,7 +1724,7 @@ def press(self, event):
 
         self.set_visible(self.visible)
 
-    def release(self, event):
+    def _release(self, event):
         """on button release event"""
         if self.spancoords == 'data':
             xmin, ymin = self.eventpress.xdata, self.eventpress.ydata
@@ -1771,7 +1771,7 @@ def release(self, event):
 
         return False
 
-    def onmove(self, event):
+    def _onmove(self, event):
         """on motion notify event if box/line is wanted"""     
         # resize an existing shape
         if self.active_handle and not self.active_handle == 'C':
@@ -2043,22 +2043,22 @@ def __init__(self, ax, onselect=None, useblit=True, lineprops=None,
     def onpress(self, event):
         self.press(event)
 
-    def press(self, event):
+    def _press(self, event):
         self.verts = [self._get_data(event)]
         self.line.set_visible(True)
 
     def onrelease(self, event):
         self.release(event)
 
-    def release(self, event):
+    def _release(self, event):
         if self.verts is not None:
             self.verts.append(self._get_data(event))
             self.onselect(self.verts)
         self.line.set_data([[], []])
         self.line.set_visible(False)
         self.verts = None
 
-    def onmove(self, event):
+    def _onmove(self, event):
         if self.verts is None:
             return
         self.verts.append(self._get_data(event))
