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

loewis@users.sourceforge.net loewis@users.sourceforge.net
Sat, 24 May 2003 04:37:18 -0700


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

Modified Files:
	Tkinter.py 
Log Message:
Convert tcl_version to str before comparing. Fixes #729317.


Index: Tkinter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.174
retrieving revision 1.175
diff -C2 -d -r1.174 -r1.175
*** Tkinter.py	17 Apr 2003 13:13:55 -0000	1.174
--- Tkinter.py	24 May 2003 11:37:15 -0000	1.175
***************
*** 1568,1572 ****
              "tk.h version (%s) doesn't match libtk.a version (%s)" \
              % (_tkinter.TK_VERSION, tk_version)
!         tcl_version = self.tk.getvar('tcl_version')
          if tcl_version != _tkinter.TCL_VERSION:
              raise RuntimeError, \
--- 1568,1573 ----
              "tk.h version (%s) doesn't match libtk.a version (%s)" \
              % (_tkinter.TK_VERSION, tk_version)
!         # Under unknown circumstances, tcl_version gets coerced to float
!         tcl_version = str(self.tk.getvar('tcl_version'))
          if tcl_version != _tkinter.TCL_VERSION:
              raise RuntimeError, \