summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-03-13 21:46:35 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-03-13 21:46:35 (GMT)
commit817dd91595d202e9582435430b98ba65d14d14a7 (patch)
tree309686a6e1d81fa0f3b8d7fb1f7eba02527c7185
parent47930016ff2bf57134d4976ae75b00b8e2dad01d (diff)
parenteb945a938dd4784c30f549b0d7224c45b32ce356 (diff)
downloadcpython-817dd91595d202e9582435430b98ba65d14d14a7.zip
cpython-817dd91595d202e9582435430b98ba65d14d14a7.tar.gz
cpython-817dd91595d202e9582435430b98ba65d14d14a7.tar.bz2
merge heads
-rw-r--r--Lib/idlelib/CallTipWindow.py6
-rw-r--r--Misc/NEWS2
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/idlelib/CallTipWindow.py b/Lib/idlelib/CallTipWindow.py
index 27ed085..a2431f8 100644
--- a/Lib/idlelib/CallTipWindow.py
+++ b/Lib/idlelib/CallTipWindow.py
@@ -22,6 +22,7 @@ class CallTip:
self.parenline = self.parencol = None
self.lastline = None
self.hideid = self.checkhideid = None
+ self.checkhide_after_id = None
def position_window(self):
"""Check if needs to reposition the window, and if so - do it."""
@@ -102,7 +103,10 @@ class CallTip:
self.hidetip()
else:
self.position_window()
- self.widget.after(CHECKHIDE_TIME, self.checkhide_event)
+ if self.checkhide_after_id is not None:
+ self.widget.after_cancel(self.checkhide_after_id)
+ self.checkhide_after_id = \
+ self.widget.after(CHECKHIDE_TIME, self.checkhide_event)
def hide_event(self, event):
if not self.tipwindow:
diff --git a/Misc/NEWS b/Misc/NEWS
index 295a425..eea3a17 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,8 @@ Core and Builtins
Library
-------
+- Issue #5219: Prevent event handler cascade in IDLE.
+
- Issue #14184: Increase the default stack size for secondary threads on
Mac OS X to avoid interpreter crashes when using threads on 10.7.