Skip to content

Commit 27169ea

Browse files
committed
_idDrag -> _id_drag.
1 parent a2f01cb commit 27169ea

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

lib/matplotlib/backend_bases.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2685,7 +2685,7 @@ def __init__(self, canvas):
26852685
# This cursor will be set after the initial draw.
26862686
self._lastCursor = cursors.POINTER
26872687
self._init_toolbar()
2688-
self._idDrag = self.canvas.mpl_connect(
2688+
self._id_drag = self.canvas.mpl_connect(
26892689
'motion_notify_event', self.mouse_move)
26902690
self._id_zoom = None
26912691

@@ -2890,9 +2890,9 @@ def press_pan(self, event):
28902890
a.get_navigate() and a.can_pan()):
28912891
a.start_pan(x, y, event.button)
28922892
self._xypress.append((a, i))
2893-
self.canvas.mpl_disconnect(self._idDrag)
2894-
self._idDrag = self.canvas.mpl_connect('motion_notify_event',
2895-
self.drag_pan)
2893+
self.canvas.mpl_disconnect(self._id_drag)
2894+
self._id_drag = self.canvas.mpl_connect(
2895+
'motion_notify_event', self.drag_pan)
28962896
self.press(event)
28972897

28982898
def press_zoom(self, event):
@@ -2949,8 +2949,8 @@ def release_pan(self, event):
29492949

29502950
if self._button_pressed is None:
29512951
return
2952-
self.canvas.mpl_disconnect(self._idDrag)
2953-
self._idDrag = self.canvas.mpl_connect(
2952+
self.canvas.mpl_disconnect(self._id_drag)
2953+
self._id_drag = self.canvas.mpl_connect(
29542954
'motion_notify_event', self.mouse_move)
29552955
for a, ind in self._xypress:
29562956
a.end_pan()

lib/matplotlib/backend_tools.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ class SetCursorBase(ToolBase):
253253
"""
254254
def __init__(self, *args, **kwargs):
255255
ToolBase.__init__(self, *args, **kwargs)
256-
self._idDrag = None
256+
self._id_drag = None
257257
self._cursor = None
258258
self._default_cursor = cursors.POINTER
259259
self._last_cursor = self._default_cursor
@@ -265,11 +265,11 @@ def __init__(self, *args, **kwargs):
265265
self._add_tool(tool)
266266

267267
def set_figure(self, figure):
268-
if self._idDrag:
269-
self.canvas.mpl_disconnect(self._idDrag)
268+
if self._id_drag:
269+
self.canvas.mpl_disconnect(self._id_drag)
270270
ToolBase.set_figure(self, figure)
271271
if figure:
272-
self._idDrag = self.canvas.mpl_connect(
272+
self._id_drag = self.canvas.mpl_connect(
273273
'motion_notify_event', self._set_cursor_cbk)
274274

275275
def _tool_trigger_cbk(self, event):
@@ -322,15 +322,15 @@ class ToolCursorPosition(ToolBase):
322322
This tool runs in the background reporting the position of the cursor.
323323
"""
324324
def __init__(self, *args, **kwargs):
325-
self._idDrag = None
325+
self._id_drag = None
326326
ToolBase.__init__(self, *args, **kwargs)
327327

328328
def set_figure(self, figure):
329-
if self._idDrag:
330-
self.canvas.mpl_disconnect(self._idDrag)
329+
if self._id_drag:
330+
self.canvas.mpl_disconnect(self._id_drag)
331331
ToolBase.set_figure(self, figure)
332332
if figure:
333-
self._idDrag = self.canvas.mpl_connect(
333+
self._id_drag = self.canvas.mpl_connect(
334334
'motion_notify_event', self.send_message)
335335

336336
def send_message(self, event):
@@ -972,12 +972,12 @@ class ToolPan(ZoomPanBase):
972972

973973
def __init__(self, *args):
974974
ZoomPanBase.__init__(self, *args)
975-
self._idDrag = None
975+
self._id_drag = None
976976

977977
def _cancel_action(self):
978978
self._button_pressed = None
979979
self._xypress = []
980-
self.figure.canvas.mpl_disconnect(self._idDrag)
980+
self.figure.canvas.mpl_disconnect(self._id_drag)
981981
self.toolmanager.messagelock.release(self)
982982
self.toolmanager.get_tool(_views_positions).refresh_locators()
983983

@@ -999,15 +999,15 @@ def _press(self, event):
999999
a.start_pan(x, y, event.button)
10001000
self._xypress.append((a, i))
10011001
self.toolmanager.messagelock(self)
1002-
self._idDrag = self.figure.canvas.mpl_connect(
1002+
self._id_drag = self.figure.canvas.mpl_connect(
10031003
'motion_notify_event', self._mouse_move)
10041004

10051005
def _release(self, event):
10061006
if self._button_pressed is None:
10071007
self._cancel_action()
10081008
return
10091009

1010-
self.figure.canvas.mpl_disconnect(self._idDrag)
1010+
self.figure.canvas.mpl_disconnect(self._id_drag)
10111011
self.toolmanager.messagelock.release(self)
10121012

10131013
for a, _ind in self._xypress:

lib/matplotlib/backends/backend_wx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ def GetToolBar(self):
10171017

10181018
def Destroy(self, *args, **kwargs):
10191019
try:
1020-
self.canvas.mpl_disconnect(self.toolbar._idDrag)
1020+
self.canvas.mpl_disconnect(self.toolbar._id_drag)
10211021
# Rationale for line above: see issue 2941338.
10221022
except AttributeError:
10231023
pass # classic toolbar lacks the attribute

0 commit comments

Comments
 (0)