[Python-checkins] python/dist/src/Lib/lib-tk Tkinter.py,1.176,1.177

nnorwitz@users.sourceforge.net nnorwitz@users.sourceforge.net
Tue, 01 Jul 2003 14:12:49 -0700


Update of /cvsroot/python/python/dist/src/Lib/lib-tk
In directory sc8-pr-cvs1:/tmp/cvs-serv4006/Lib/lib-tk

Modified Files:
	Tkinter.py 
Log Message:
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.


Index: Tkinter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -d -r1.176 -r1.177
*** Tkinter.py	7 Jun 2003 19:52:38 -0000	1.176
--- Tkinter.py	1 Jul 2003 21:12:47 -0000	1.177
***************
*** 476,481 ****
          given as first parameter."""
          try:
!             (script, type) = self.tk.splitlist(
!                 self.tk.call('after', 'info', id))
              self.deletecommand(script)
          except TclError:
--- 476,483 ----
          given as first parameter."""
          try:
!             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: