[Python-checkins] python/dist/src/Modules _tkinter.c,1.158,1.159

loewis@users.sourceforge.net loewis@users.sourceforge.net
Mon, 19 May 2003 12:57:45 -0700


Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv30463

Modified Files:
	_tkinter.c 
Log Message:
Only return objects if wantobjects is set in GetVar.


Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** _tkinter.c	9 May 2003 08:19:48 -0000	1.158
--- _tkinter.c	19 May 2003 19:57:42 -0000	1.159
***************
*** 1648,1652 ****
  	tres = Tcl_GetVar2Ex(Tkapp_Interp(self), name1, name2, flags);
  	ENTER_OVERLAP
! 	res = FromObj(self, tres);
  	LEAVE_OVERLAP_TCL
  	return res;
--- 1648,1657 ----
  	tres = Tcl_GetVar2Ex(Tkapp_Interp(self), name1, name2, flags);
  	ENTER_OVERLAP
! 	if (((TkappObject*)self)->wantobjects) {
! 		res = FromObj(self, tres);
! 	}
! 	else {
! 		res = PyString_FromString(Tcl_GetString(tres));
! 	}
  	LEAVE_OVERLAP_TCL
  	return res;