[Python-checkins] python/dist/src/Objects typeobject.c,2.252,2.253

[tim_one at users.sourceforge.net]

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

Modified Files:
	typeobject.c 
Log Message:
subtype_dealloc():  Simplified overly contorted retracking logic.  With
this change, I think subtype_dealloc is actually a smidgen less obscure
than it was in 2.3 -- we got rid of a negation in an "if" <wink>.


Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.252
retrieving revision 2.253
diff -C2 -d -r2.252 -r2.253
*** typeobject.c	13 Nov 2003 21:59:32 -0000	2.252
--- typeobject.c	13 Nov 2003 22:50:00 -0000	2.253
***************
*** 691,700 ****
  	}
  
! 	/* Finalize GC if the base doesn't do GC and we do */
! 	_PyObject_GC_TRACK(self);
! 	if (!PyType_IS_GC(base))
! 		_PyObject_GC_UNTRACK(self);
! 
! 	/* Call the base tp_dealloc() */
  	assert(basedealloc);
  	basedealloc(self);
--- 691,699 ----
  	}
  
! 	/* Call the base tp_dealloc(); first retrack self if
! 	 * basedealloc knows about gc.
! 	 */
! 	if (PyType_IS_GC(base))
! 		_PyObject_GC_TRACK(self);
  	assert(basedealloc);
  	basedealloc(self);