[Python-checkins] CVS: python/dist/src/Modules _tkinter.c,1.114,1.114.2.1

[Martin v. L?wis]

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

Modified Files:
      Tag: release20-maint
	_tkinter.c 
Log Message:
Move _tkinter.c 1.115 into release branch.


Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.114
retrieving revision 1.114.2.1
diff -C2 -r1.114 -r1.114.2.1
*** _tkinter.c	2000/10/12 17:14:46	1.114
--- _tkinter.c	2001/03/15 16:56:36	1.114.2.1
***************
*** 573,583 ****
  
  	if (args == NULL)
! 		objc = 0;
  
  	else if (!PyTuple_Check(args)) {
- 		objc = 1;
  		objv[0] = AsObj(args);
  		if (objv[0] == 0)
  			goto finally;
  		Tcl_IncrRefCount(objv[0]);
  	}
--- 573,583 ----
  
  	if (args == NULL)
! 		/* do nothing */;
  
  	else if (!PyTuple_Check(args)) {
  		objv[0] = AsObj(args);
  		if (objv[0] == 0)
  			goto finally;
+ 		objc = 1;
  		Tcl_IncrRefCount(objv[0]);
  	}
***************
*** 589,592 ****
--- 589,593 ----
  			if (objv == NULL) {
  				PyErr_NoMemory();
+ 				objc = 0;
  				goto finally;
  			}
***************
*** 600,605 ****
  			}
  			objv[i] = AsObj(v);
! 			if (!objv[i])
  				goto finally;
  			Tcl_IncrRefCount(objv[i]);
  		}
--- 601,610 ----
  			}
  			objv[i] = AsObj(v);
! 			if (!objv[i]) {
! 				/* Reset objc, so it attempts to clear
! 				   objects only up to i. */
! 				objc = i;
  				goto finally;
+ 			}
  			Tcl_IncrRefCount(objv[i]);
  		}