Skip to content

Commit 0ec2716

Browse files
timhoffmtimhoffm
committed
Consistently name callback arguments event instead of evt
1 parent bc04c8a commit 0ec2716

File tree

11 files changed

+76
-75
lines changed

11 files changed

+76
-75
lines changed

‎examples/event_handling/close_event.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
import matplotlib.pyplot as plt
99

1010

11-
def handle_close(evt):
11+
def on_close(event):
1212
print('Closed Figure!')
1313

1414
fig = plt.figure()
15-
fig.canvas.mpl_connect('close_event', handle_close)
15+
fig.canvas.mpl_connect('close_event', on_close)
1616

1717
plt.text(0.35, 0.5, 'Close Me!', dict(size=30))
1818
plt.show()

‎examples/event_handling/pipong.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def __init__(self, ax):
181181
animated=False)
182182
self.canvas.mpl_connect('key_press_event', self.key_press)
183183

184-
def draw(self, evt):
184+
def draw(self, event):
185185
draw_artist = self.ax.draw_artist
186186
if self.background is None:
187187
self.background = self.canvas.copy_from_bbox(self.ax.bbox)

‎examples/event_handling/timers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def update_title(axes):
2727
timer.start()
2828

2929
# Or could start the timer on first figure draw
30-
#def start_timer(evt):
30+
#def start_timer(event):
3131
# timer.start()
3232
# fig.canvas.mpl_disconnect(drawid)
3333
#drawid = fig.canvas.mpl_connect('draw_event', start_timer)

‎examples/user_interfaces/embedding_in_wx3_sgskip.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def GetToolBar(self):
7878
# unmanaged toolbar in your frame
7979
return self.toolbar
8080

81-
def OnWhiz(self, evt):
81+
def OnWhiz(self, event):
8282
self.x += np.pi / 15
8383
self.y += np.pi / 20
8484
z = np.sin(self.x) + np.cos(self.y)

‎examples/user_interfaces/embedding_in_wx4_sgskip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ def __init__(self, canvas):
2828
'Activate custom control')
2929
self.Bind(wx.EVT_TOOL, self._on_custom, id=tool.GetId())
3030

31-
def _on_custom(self, evt):
31+
def _on_custom(self, event):
3232
# add some text to the axes in a random location in axes coords with a
3333
# random color
3434
ax = self.canvas.figure.axes[0]
3535
x, y = np.random.rand(2) # generate a random location
3636
rgb = np.random.rand(3) # generate a random color
3737
ax.text(x, y, 'You clicked me', transform=ax.transAxes, color=rgb)
3838
self.canvas.draw()
39-
evt.Skip()
39+
event.Skip()
4040

4141

4242
class CanvasFrame(wx.Frame):

‎examples/user_interfaces/fourier_demo_wx_sgskip.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ def __init__(self, parent, label, param):
8989
self.param = param
9090
self.param.attach(self)
9191

92-
def sliderHandler(self, evt):
93-
value = evt.GetInt() / 1000.
92+
def sliderHandler(self, event):
93+
value = event.GetInt() / 1000.
9494
self.param.set(value)
9595

96-
def sliderTextHandler(self, evt):
96+
def sliderTextHandler(self, event):
9797
value = float(self.sliderText.GetValue())
9898
self.param.set(value)
9999

@@ -148,21 +148,21 @@ def createSliders(self, panel):
148148
self.amplitudeSliderGroup = SliderGroup(panel, label=' Amplitude a:',
149149
param=self.A)
150150

151-
def mouseDown(self, evt):
152-
if self.lines[0].contains(evt)[0]:
151+
def mouseDown(self, event):
152+
if self.lines[0].contains(event)[0]:
153153
self.state = 'frequency'
154-
elif self.lines[1].contains(evt)[0]:
154+
elif self.lines[1].contains(event)[0]:
155155
self.state = 'time'
156156
else:
157157
self.state = ''
158-
self.mouseInfo = (evt.xdata, evt.ydata,
158+
self.mouseInfo = (event.xdata, event.ydata,
159159
max(self.f0.value, .1),
160160
self.A.value)
161161

162-
def mouseMotion(self, evt):
162+
def mouseMotion(self, event):
163163
if self.state == '':
164164
return
165-
x, y = evt.xdata, evt.ydata
165+
x, y = event.xdata, event.ydata
166166
if x is None: # outside the axes
167167
return
168168
x0, y0, f0Init, AInit = self.mouseInfo
@@ -173,7 +173,7 @@ def mouseMotion(self, evt):
173173
if (x - x0) / x0 != -1.:
174174
self.f0.set(1. / (1. / f0Init + (1. / f0Init * (x - x0) / x0)))
175175

176-
def mouseUp(self, evt):
176+
def mouseUp(self, event):
177177
self.state = ''
178178

179179
def createPlots(self):

‎examples/user_interfaces/svg_tooltip_sgskip.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
# Create XML tree from the SVG file.
6565
tree, xmlid = ET.XMLID(f.getvalue())
66-
tree.set('onload', 'init(evt)')
66+
tree.set('onload', 'init(event)')
6767

6868
for i in shapes:
6969
# Get the index of the shape
@@ -81,9 +81,9 @@
8181
<script type="text/ecmascript">
8282
<![CDATA[
8383
84-
function init(evt) {
84+
function init(event) {
8585
if ( window.svgDocument == null ) {
86-
svgDocument = evt.target.ownerDocument;
86+
svgDocument = event.target.ownerDocument;
8787
}
8888
}
8989

‎lib/matplotlib/animation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ def _handle_resize(self, *args):
12661266
self._resize_id = self._fig.canvas.mpl_connect('draw_event',
12671267
self._end_redraw)
12681268

1269-
def _end_redraw(self, evt):
1269+
def _end_redraw(self, event):
12701270
# Now that the redraw has happened, do the post draw flushing and
12711271
# blit handling. Then re-enable all of the original events.
12721272
self._post_draw(None, False)

‎lib/matplotlib/backends/_backend_tk.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ def __init__(self, figure, master=None, resize_callback=None):
230230

231231
# Can't get destroy events by binding to _tkcanvas. Therefore, bind
232232
# to the window and filter.
233-
def filter_destroy(evt):
234-
if evt.widget is self._tkcanvas:
233+
def filter_destroy(event):
234+
if event.widget is self._tkcanvas:
235235
self._master.update_idletasks()
236236
self.close_event()
237237
root.bind("<Destroy>", filter_destroy, "+")

‎lib/matplotlib/backends/backend_wx.py

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ def print_figure(self, filename, *args, **kwargs):
688688
if self._isDrawn:
689689
self.draw()
690690

691-
def _onPaint(self, evt):
691+
def _onPaint(self, event):
692692
"""Called when wxPaintEvt is generated."""
693693
_log.debug("%s - _onPaint()", type(self))
694694
drawDC = wx.PaintDC(self)
@@ -698,7 +698,7 @@ def _onPaint(self, evt):
698698
self.gui_repaint(drawDC=drawDC)
699699
drawDC.Destroy()
700700

701-
def _onSize(self, evt):
701+
def _onSize(self, event):
702702
"""
703703
Called when wxEventSize is generated.
704704
@@ -742,41 +742,41 @@ def _onSize(self, evt):
742742
self.Refresh(eraseBackground=False)
743743
FigureCanvasBase.resize_event(self)
744744

745-
def _get_key(self, evt):
745+
def _get_key(self, event):
746746

747-
keyval = evt.KeyCode
747+
keyval = event.KeyCode
748748
if keyval in self.keyvald:
749749
key = self.keyvald[keyval]
750750
elif keyval < 256:
751751
key = chr(keyval)
752752
# wx always returns an uppercase, so make it lowercase if the shift
753753
# key is not depressed (NOTE: this will not handle Caps Lock)
754-
if not evt.ShiftDown():
754+
if not event.ShiftDown():
755755
key = key.lower()
756756
else:
757757
key = None
758758

759759
for meth, prefix in (
760-
[evt.AltDown, 'alt'],
761-
[evt.ControlDown, 'ctrl'], ):
760+
[event.AltDown, 'alt'],
761+
[event.ControlDown, 'ctrl'], ):
762762
if meth():
763763
key = '{0}+{1}'.format(prefix, key)
764764

765765
return key
766766

767-
def _onKeyDown(self, evt):
767+
def _onKeyDown(self, event):
768768
"""Capture key press."""
769-
key = self._get_key(evt)
770-
FigureCanvasBase.key_press_event(self, key, guiEvent=evt)
769+
key = self._get_key(event)
770+
FigureCanvasBase.key_press_event(self, key, guiEvent=event)
771771
if self:
772-
evt.Skip()
772+
event.Skip()
773773

774-
def _onKeyUp(self, evt):
774+
def _onKeyUp(self, event):
775775
"""Release key."""
776-
key = self._get_key(evt)
777-
FigureCanvasBase.key_release_event(self, key, guiEvent=evt)
776+
key = self._get_key(event)
777+
FigureCanvasBase.key_release_event(self, key, guiEvent=event)
778778
if self:
779-
evt.Skip()
779+
event.Skip()
780780

781781
def _set_capture(self, capture=True):
782782
"""Control wx mouse capture."""
@@ -785,39 +785,40 @@ def _set_capture(self, capture=True):
785785
if capture:
786786
self.CaptureMouse()
787787

788-
def _onCaptureLost(self, evt):
788+
def _onCaptureLost(self, event):
789789
"""Capture changed or lost"""
790790
self._set_capture(False)
791791

792-
def _onMouseButton(self, evt):
792+
def _onMouseButton(self, event):
793793
"""Start measuring on an axis."""
794-
evt.Skip()
795-
self._set_capture(evt.ButtonDown() or evt.ButtonDClick())
796-
x = evt.X
797-
y = self.figure.bbox.height - evt.Y
794+
event.Skip()
795+
self._set_capture(event.ButtonDown() or event.ButtonDClick())
796+
x = event.X
797+
y = self.figure.bbox.height - event.Y
798798
button_map = {
799799
wx.MOUSE_BTN_LEFT: MouseButton.LEFT,
800800
wx.MOUSE_BTN_MIDDLE: MouseButton.MIDDLE,
801801
wx.MOUSE_BTN_RIGHT: MouseButton.RIGHT,
802802
}
803-
button = evt.GetButton()
803+
button = event.GetButton()
804804
button = button_map.get(button, button)
805-
if evt.ButtonDown():
806-
self.button_press_event(x, y, button, guiEvent=evt)
807-
elif evt.ButtonDClick():
808-
self.button_press_event(x, y, button, dblclick=True, guiEvent=evt)
809-
elif evt.ButtonUp():
810-
self.button_release_event(x, y, button, guiEvent=evt)
811-
812-
def _onMouseWheel(self, evt):
805+
if event.ButtonDown():
806+
self.button_press_event(x, y, button, guiEvent=event)
807+
elif event.ButtonDClick():
808+
self.button_press_event(x, y, button, dblclick=True,
809+
guiEvent=event)
810+
elif event.ButtonUp():
811+
self.button_release_event(x, y, button, guiEvent=event)
812+
813+
def _onMouseWheel(self, event):
813814
"""Translate mouse wheel events into matplotlib events"""
814815
# Determine mouse location
815-
x = evt.GetX()
816-
y = self.figure.bbox.height - evt.GetY()
816+
x = event.GetX()
817+
y = self.figure.bbox.height - event.GetY()
817818
# Convert delta/rotation/rate into a floating point step size
818-
step = evt.LinesPerAction * evt.WheelRotation / evt.WheelDelta
819+
step = event.LinesPerAction * event.WheelRotation / event.WheelDelta
819820
# Done handling event
820-
evt.Skip()
821+
event.Skip()
821822
# Mac gives two events for every wheel event; skip every second one.
822823
if wx.Platform == '__WXMAC__':
823824
if not hasattr(self, '_skipwheelevent'):
@@ -827,26 +828,26 @@ def _onMouseWheel(self, evt):
827828
return # Return without processing event
828829
else:
829830
self._skipwheelevent = True
830-
FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=evt)
831+
FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
831832

832-
def _onMotion(self, evt):
833+
def _onMotion(self, event):
833834
"""Start measuring on an axis."""
834-
x = evt.GetX()
835-
y = self.figure.bbox.height - evt.GetY()
836-
evt.Skip()
837-
FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=evt)
835+
x = event.GetX()
836+
y = self.figure.bbox.height - event.GetY()
837+
event.Skip()
838+
FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=event)
838839

839-
def _onLeave(self, evt):
840+
def _onLeave(self, event):
840841
"""Mouse has left the window."""
841-
evt.Skip()
842-
FigureCanvasBase.leave_notify_event(self, guiEvent=evt)
842+
event.Skip()
843+
FigureCanvasBase.leave_notify_event(self, guiEvent=event)
843844

844-
def _onEnter(self, evt):
845+
def _onEnter(self, event):
845846
"""Mouse has entered the window."""
846-
x = evt.GetX()
847-
y = self.figure.bbox.height - evt.GetY()
848-
evt.Skip()
849-
FigureCanvasBase.enter_notify_event(self, guiEvent=evt, xy=(x, y))
847+
x = event.GetX()
848+
y = self.figure.bbox.height - event.GetY()
849+
event.Skip()
850+
FigureCanvasBase.enter_notify_event(self, guiEvent=event, xy=(x, y))
850851

851852

852853
class FigureCanvasWx(_FigureCanvasWxBase):
@@ -1024,7 +1025,7 @@ def get_figure_manager(self):
10241025
_log.debug("%s - get_figure_manager()", type(self))
10251026
return self.figmgr
10261027

1027-
def _onClose(self, evt):
1028+
def _onClose(self, event):
10281029
_log.debug("%s - onClose()", type(self))
10291030
self.canvas.close_event()
10301031
self.canvas.stop_event_loop()
@@ -1593,10 +1594,10 @@ def __init__(self, parent, help_entries):
15931594
self.Bind(wx.EVT_CLOSE, self.OnClose)
15941595
OK.Bind(wx.EVT_BUTTON, self.OnClose)
15951596

1596-
def OnClose(self, evt):
1597+
def OnClose(self, event):
15971598
_HelpDialog._instance = None # remove global reference
15981599
self.DestroyLater()
1599-
evt.Skip()
1600+
event.Skip()
16001601

16011602
@classmethod
16021603
def show(cls, parent, help_entries):

‎tools/triage_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def __init__(self, parent, index, name):
7272
layout.addWidget(self.image)
7373
self.setLayout(layout)
7474

75-
def mousePressEvent(self, ev):
75+
def mousePressEvent(self, event):
7676
self.parent.set_large_image(self.index)
7777

7878

0 commit comments

Comments
 (0)