[Python-checkins] python/dist/src/Modules cPickle.c,2.73.2.1.2.5,2.73.2.1.2.6

[tim_one@users.sourceforge.net]

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

Modified Files:
      Tag: release22-maint
	cPickle.c 
Log Message:
PyType_Ready():  Complain if the type is a base type, and gc'able, and
tp_free is NULL or PyObject_Del at the end.  Because it's a base type
it must call tp_free in its dealloc function, and because it's gc'able
it must not call PyObject_Del.

inherit_slots():  Don't inherit tp_free unless the type and its base
agree about whether they're gc'able.  If the type is gc'able and the
base is not, and the base uses the default PyObject_Del for its
tp_free, give the type PyObject_GC_Del for its tp_free (the appropriate
default for a gc'able type).

cPickle.c:  The Pickler and Unpickler types claim to be base classes
and gc'able, but their dealloc functions didn't call tp_free.
Repaired that.  Also call PyType_Ready() on these typeobjects, so
that the correct (PyObject_GC_Del) default memory-freeing function
gets plugged into these types' tp_free slots.


Index: cPickle.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.73.2.1.2.5
retrieving revision 2.73.2.1.2.6
diff -C2 -d -r2.73.2.1.2.5 -r2.73.2.1.2.6
*** cPickle.c	9 May 2003 18:29:20 -0000	2.73.2.1.2.5
--- cPickle.c	21 May 2003 20:43:09 -0000	2.73.2.1.2.6
***************
*** 2370,2374 ****
      }
  
!     PyObject_GC_Del(self);
  }
  
--- 2370,2374 ----
      }
  
!     self->ob_type->tp_free((PyObject *)self);
  }
  
***************
*** 4319,4323 ****
      }
  
!     PyObject_GC_Del(self);
  }
  
--- 4319,4323 ----
      }
  
!     self->ob_type->tp_free((PyObject *)self);
  }
  
***************
*** 4607,4610 ****
--- 4607,4615 ----
  #define INIT_STR(S) UNLESS(S ## _str=PyString_InternFromString(#S)) return -1;
  
+     if (PyType_Ready(&Unpicklertype) < 0)
+     	return -1;
+     if (PyType_Ready(&Picklertype) < 0)
+     	return -1;
+   
      INIT_STR(__class__);
      INIT_STR(__getinitargs__);