diff --git a/examples/event_handling/close_event.py b/examples/event_handling/close_event.py index 7613ec45bec9..9566167bdc6c 100644 --- a/examples/event_handling/close_event.py +++ b/examples/event_handling/close_event.py @@ -8,11 +8,11 @@ import matplotlib.pyplot as plt -def handle_close(evt): +def on_close(event): print('Closed Figure!') fig = plt.figure() -fig.canvas.mpl_connect('close_event', handle_close) +fig.canvas.mpl_connect('close_event', on_close) plt.text(0.35, 0.5, 'Close Me!', dict(size=30)) plt.show() diff --git a/examples/event_handling/pipong.py b/examples/event_handling/pipong.py index ed9d0fd9f462..9788cd5bf74d 100644 --- a/examples/event_handling/pipong.py +++ b/examples/event_handling/pipong.py @@ -181,7 +181,7 @@ def __init__(self, ax): animated=False) self.canvas.mpl_connect('key_press_event', self.key_press) - def draw(self, evt): + def draw(self, event): draw_artist = self.ax.draw_artist if self.background is None: self.background = self.canvas.copy_from_bbox(self.ax.bbox) diff --git a/examples/event_handling/timers.py b/examples/event_handling/timers.py index aba9393699dd..4db7fe40bdc3 100644 --- a/examples/event_handling/timers.py +++ b/examples/event_handling/timers.py @@ -27,7 +27,7 @@ def update_title(axes): timer.start() # Or could start the timer on first figure draw -#def start_timer(evt): +#def start_timer(event): # timer.start() # fig.canvas.mpl_disconnect(drawid) #drawid = fig.canvas.mpl_connect('draw_event', start_timer) diff --git a/examples/user_interfaces/embedding_in_wx3_sgskip.py b/examples/user_interfaces/embedding_in_wx3_sgskip.py index 900c38b70dcc..c59842a455db 100644 --- a/examples/user_interfaces/embedding_in_wx3_sgskip.py +++ b/examples/user_interfaces/embedding_in_wx3_sgskip.py @@ -78,7 +78,7 @@ def GetToolBar(self): # unmanaged toolbar in your frame return self.toolbar - def OnWhiz(self, evt): + def OnWhiz(self, event): self.x += np.pi / 15 self.y += np.pi / 20 z = np.sin(self.x) + np.cos(self.y) diff --git a/examples/user_interfaces/embedding_in_wx4_sgskip.py b/examples/user_interfaces/embedding_in_wx4_sgskip.py index 19bda8f8e388..f79113280d72 100644 --- a/examples/user_interfaces/embedding_in_wx4_sgskip.py +++ b/examples/user_interfaces/embedding_in_wx4_sgskip.py @@ -28,7 +28,7 @@ def __init__(self, canvas): 'Activate custom control') self.Bind(wx.EVT_TOOL, self._on_custom, id=tool.GetId()) - def _on_custom(self, evt): + def _on_custom(self, event): # add some text to the axes in a random location in axes coords with a # random color ax = self.canvas.figure.axes[0] @@ -36,7 +36,7 @@ def _on_custom(self, evt): rgb = np.random.rand(3) # generate a random color ax.text(x, y, 'You clicked me', transform=ax.transAxes, color=rgb) self.canvas.draw() - evt.Skip() + event.Skip() class CanvasFrame(wx.Frame): diff --git a/examples/user_interfaces/fourier_demo_wx_sgskip.py b/examples/user_interfaces/fourier_demo_wx_sgskip.py index 40003c0b4552..74e0ec44e5e9 100644 --- a/examples/user_interfaces/fourier_demo_wx_sgskip.py +++ b/examples/user_interfaces/fourier_demo_wx_sgskip.py @@ -89,11 +89,11 @@ def __init__(self, parent, label, param): self.param = param self.param.attach(self) - def sliderHandler(self, evt): - value = evt.GetInt() / 1000. + def sliderHandler(self, event): + value = event.GetInt() / 1000. self.param.set(value) - def sliderTextHandler(self, evt): + def sliderTextHandler(self, event): value = float(self.sliderText.GetValue()) self.param.set(value) @@ -148,21 +148,21 @@ def createSliders(self, panel): self.amplitudeSliderGroup = SliderGroup(panel, label=' Amplitude a:', param=self.A) - def mouseDown(self, evt): - if self.lines[0].contains(evt)[0]: + def mouseDown(self, event): + if self.lines[0].contains(event)[0]: self.state = 'frequency' - elif self.lines[1].contains(evt)[0]: + elif self.lines[1].contains(event)[0]: self.state = 'time' else: self.state = '' - self.mouseInfo = (evt.xdata, evt.ydata, + self.mouseInfo = (event.xdata, event.ydata, max(self.f0.value, .1), self.A.value) - def mouseMotion(self, evt): + def mouseMotion(self, event): if self.state == '': return - x, y = evt.xdata, evt.ydata + x, y = event.xdata, event.ydata if x is None: # outside the axes return x0, y0, f0Init, AInit = self.mouseInfo @@ -173,7 +173,7 @@ def mouseMotion(self, evt): if (x - x0) / x0 != -1.: self.f0.set(1. / (1. / f0Init + (1. / f0Init * (x - x0) / x0))) - def mouseUp(self, evt): + def mouseUp(self, event): self.state = '' def createPlots(self): diff --git a/examples/user_interfaces/svg_tooltip_sgskip.py b/examples/user_interfaces/svg_tooltip_sgskip.py index 8b8d0c230713..b9d51e41cb81 100644 --- a/examples/user_interfaces/svg_tooltip_sgskip.py +++ b/examples/user_interfaces/svg_tooltip_sgskip.py @@ -63,7 +63,7 @@ # Create XML tree from the SVG file. tree, xmlid = ET.XMLID(f.getvalue()) -tree.set('onload', 'init(evt)') +tree.set('onload', 'init(event)') for i in shapes: # Get the index of the shape @@ -81,9 +81,9 @@