[Python-3000-checkins] r57202 - in python/branches/py3k: Doc/c-api/newtypes.rst Doc/data/refcounts.dat Include/objimpl.h Misc/NEWS Modules/_randommodule.c Modules/bz2module.c Objects/typeobject.c PC/os2emx/python25.def

[neal.norwitz]

Author: neal.norwitz
Date: Mon Aug 20 00:48:23 2007
New Revision: 57202

Modified:
   python/branches/py3k/Doc/c-api/newtypes.rst
   python/branches/py3k/Doc/data/refcounts.dat
   python/branches/py3k/Include/objimpl.h
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/_randommodule.c
   python/branches/py3k/Modules/bz2module.c
   python/branches/py3k/Objects/typeobject.c
   python/branches/py3k/PC/os2emx/python25.def
Log:
Remove _PyObject_Del

Modified: python/branches/py3k/Doc/c-api/newtypes.rst
==============================================================================
--- python/branches/py3k/Doc/c-api/newtypes.rst	(original)
+++ python/branches/py3k/Doc/c-api/newtypes.rst	Mon Aug 20 00:48:23 2007
@@ -23,9 +23,6 @@
 .. cfunction:: PyVarObject* _PyObject_NewVar(PyTypeObject *type, Py_ssize_t size)
 
 
-.. cfunction:: void _PyObject_Del(PyObject *op)
-
-
 .. cfunction:: PyObject* PyObject_Init(PyObject *op, PyTypeObject *type)
 
    Initialize a newly-allocated object *op* with its type and initial reference.
@@ -1331,7 +1328,7 @@
 
       void tp_free(void *)
 
-   The only initializer that is compatible with both versions is ``_PyObject_Del``,
+   The only initializer that is compatible with both versions is ``PyObject_Free``,
    whose definition has suitably adapted in Python 2.3.
 
    This field is inherited by static subtypes, but not by dynamic subtypes

Modified: python/branches/py3k/Doc/data/refcounts.dat
==============================================================================
--- python/branches/py3k/Doc/data/refcounts.dat	(original)
+++ python/branches/py3k/Doc/data/refcounts.dat	Mon Aug 20 00:48:23 2007
@@ -1705,9 +1705,6 @@
 
 _PyImport_Init:void:::
 
-_PyObject_Del:void:::
-_PyObject_Del:PyObject*:op:0:
-
 _PyObject_New:PyObject*::+1:
 _PyObject_New:PyTypeObject*:type:0:
 

Modified: python/branches/py3k/Include/objimpl.h
==============================================================================
--- python/branches/py3k/Include/objimpl.h	(original)
+++ python/branches/py3k/Include/objimpl.h	Mon Aug 20 00:48:23 2007
@@ -131,9 +131,6 @@
 #define PyObject_Del		PyObject_Free
 #define PyObject_DEL		PyObject_FREE
 
-/* for source compatibility with 2.2 */
-#define _PyObject_Del		PyObject_Free
-
 /*
  * Generic object allocator interface
  * ==================================

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Mon Aug 20 00:48:23 2007
@@ -232,7 +232,7 @@
   nb_divide, nb_inplace_divide
 
 - Removed these macros:
-  staticforward, statichere, PyArg_GetInt, PyArg_NoArgs
+  staticforward, statichere, PyArg_GetInt, PyArg_NoArgs, _PyObject_Del
 
 - Removed these typedefs:
   intargfunc, intintargfunc, intobjargproc, intintobjargproc,

Modified: python/branches/py3k/Modules/_randommodule.c
==============================================================================
--- python/branches/py3k/Modules/_randommodule.c	(original)
+++ python/branches/py3k/Modules/_randommodule.c	Mon Aug 20 00:48:23 2007
@@ -557,7 +557,7 @@
 	0,				/*tp_init*/
 	0,				/*tp_alloc*/
 	random_new,			/*tp_new*/
-	_PyObject_Del,			/*tp_free*/
+	PyObject_Free,			/*tp_free*/
 	0,				/*tp_is_gc*/
 };
 

Modified: python/branches/py3k/Modules/bz2module.c
==============================================================================
--- python/branches/py3k/Modules/bz2module.c	(original)
+++ python/branches/py3k/Modules/bz2module.c	Mon Aug 20 00:48:23 2007
@@ -1336,7 +1336,7 @@
         (initproc)BZ2File_init, /*tp_init*/
         PyType_GenericAlloc,    /*tp_alloc*/
         PyType_GenericNew,      /*tp_new*/
-      	_PyObject_Del,          /*tp_free*/
+      	PyObject_Free,          /*tp_free*/
         0,                      /*tp_is_gc*/
 };
 
@@ -1612,7 +1612,7 @@
         (initproc)BZ2Comp_init, /*tp_init*/
         PyType_GenericAlloc,    /*tp_alloc*/
         PyType_GenericNew,      /*tp_new*/
-      	_PyObject_Del,          /*tp_free*/
+      	PyObject_Free,          /*tp_free*/
         0,                      /*tp_is_gc*/
 };
 
@@ -1836,7 +1836,7 @@
         (initproc)BZ2Decomp_init, /*tp_init*/
         PyType_GenericAlloc,    /*tp_alloc*/
         PyType_GenericNew,      /*tp_new*/
-      	_PyObject_Del,          /*tp_free*/
+      	PyObject_Free,          /*tp_free*/
         0,                      /*tp_is_gc*/
 };
 

Modified: python/branches/py3k/Objects/typeobject.c
==============================================================================
--- python/branches/py3k/Objects/typeobject.c	(original)
+++ python/branches/py3k/Objects/typeobject.c	Mon Aug 20 00:48:23 2007
@@ -3302,7 +3302,7 @@
 		}
 		else if ((type->tp_flags & Py_TPFLAGS_HAVE_GC) &&
 			 type->tp_free == NULL &&
-			 base->tp_free == _PyObject_Del) {
+			 base->tp_free == PyObject_Free) {
 			/* A bit of magic to plug in the correct default
 			 * tp_free function when a derived class adds gc,
 			 * didn't define tp_free, and the base uses the

Modified: python/branches/py3k/PC/os2emx/python25.def
==============================================================================
--- python/branches/py3k/PC/os2emx/python25.def	(original)
+++ python/branches/py3k/PC/os2emx/python25.def	Mon Aug 20 00:48:23 2007
@@ -456,7 +456,6 @@
   "PyObject_InitVar"
   "_PyObject_New"
   "_PyObject_NewVar"
-  "_PyObject_Del"
   "_Py_ReadyTypes"
   "_Py_SwappedOp"
   "_Py_NotImplementedStruct"