[Python-checkins] python/dist/src/Modules _tkinter.c,1.160,1.161

loewis@users.sourceforge.net loewis@users.sourceforge.net
Sat, 14 Jun 2003 14:34:34 -0700


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

Modified Files:
	_tkinter.c 
Log Message:
Properly deal with tuples in Open._fixresult. Fixes bug reported in
follow-up to #621891.


Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** _tkinter.c	29 May 2003 00:17:03 -0000	1.160
--- _tkinter.c	14 Jun 2003 21:34:32 -0000	1.161
***************
*** 2605,2611 ****
  {
  
! 	int wantobjects;
! 	if (!PyArg_ParseTuple(args, "i:wantobjects", &wantobjects))
  		return NULL;
  	((TkappObject*)self)->wantobjects = wantobjects;
  
--- 2605,2613 ----
  {
  
! 	int wantobjects = -1;
! 	if (!PyArg_ParseTuple(args, "|i:wantobjects", &wantobjects))
  		return NULL;
+ 	if (wantobjects == -1)
+ 		return PyBool_FromLong(((TkappObject*)self)->wantobjects);
  	((TkappObject*)self)->wantobjects = wantobjects;