summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2003-07-01 21:12:47 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2003-07-01 21:12:47 (GMT)
commit3c0f2c91adf086f809169f94ca9a2a75df3dc996 (patch)
tree5e379450b2aa832000360993bc12550fcee972a5 /Lib
parentbcc58e87e8595bcb374947a30e0bf3d62771abbf (diff)
downloadcpython-3c0f2c91adf086f809169f94ca9a2a75df3dc996.zip
cpython-3c0f2c91adf086f809169f94ca9a2a75df3dc996.tar.gz
cpython-3c0f2c91adf086f809169f94ca9a2a75df3dc996.tar.bz2
Fix SF bug #763637, 2.3b2 unpack tuple of wrong size in after_cancel
Tk 8.4 may return different values than 8.3. This fix should handle either version.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/lib-tk/Tkinter.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 11dae12..b5b0af3 100644
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -475,8 +475,10 @@ class Misc:
Identifier returned by after or after_idle must be
given as first parameter."""
try:
- (script, type) = self.tk.splitlist(
- self.tk.call('after', 'info', id))
+ data = self.tk.call('after', 'info', id)
+ # In Tk 8.3, splitlist returns: (script, type)
+ # In Tk 8.4, splitlist may return (script, type) or (script,)
+ script = self.tk.splitlist(data)[0]
self.deletecommand(script)
except TclError:
pass