[Python-checkins] CVS: python/dist/src/Objects typeobject.c,2.118,2.119

[Guido van Rossum]

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

Modified Files:
	typeobject.c 
Log Message:
Fix for SF bug #485678.

slot_tp_descr_set(): When deleting an attribute described by a
descriptor implemented in Python, the descriptor's __del__ method is
called by the slot_tp_descr_set dispatch function.  This is bogus --
__del__ already has a different meaning. Renaming this use of __del__
is renamed to __delete__.


Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.118
retrieving revision 2.119
diff -C2 -d -r2.118 -r2.119
*** typeobject.c	2001/11/14 23:32:33	2.118
--- typeobject.c	2001/12/03 00:08:33	2.119
***************
*** 3282,3286 ****
  
  	if (value == NULL)
! 		res = call_method(self, "__del__", &del_str,
  				  "(O)", target);
  	else
--- 3282,3286 ----
  
  	if (value == NULL)
! 		res = call_method(self, "__delete__", &del_str,
  				  "(O)", target);
  	else