PyObject_Del can now be used as a function designator.

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 46de178f689edada68179a0ff1c386524983780b..1aa76dc526a14a2c7e9d2101a473fafb98989a60 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1719,7 +1719,7 @@ statichere PyTypeObject Arraytype = {
        0,                                      /* tp_init */
        PyType_GenericAlloc,                    /* tp_alloc */
        array_new,                              /* tp_new */
-       _PyObject_Del,                          /* tp_free */
+       PyObject_Del,                           /* tp_free */
 };
 
 /* No functions in array module. */

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 4366b17776df429773962319ee3187c99442c8cb..53952fcb9d495e63fd407c35ca3a074408dcd94e 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2703,7 +2703,7 @@ init_socket(void)
        PySocketSock_Type.ob_type = &PyType_Type;
        PySocketSock_Type.tp_getattro = PyObject_GenericGetAttr;
        PySocketSock_Type.tp_alloc = PyType_GenericAlloc;
-       PySocketSock_Type.tp_free = _PyObject_Del;
+       PySocketSock_Type.tp_free = PyObject_Del;
        m = Py_InitModule3(PySocket_MODULE_NAME, 
                           PySocket_methods, 
                           module_doc);

diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 48a9afa2e7fafcc591ff4b199d604c8a504fc3fa..3dbaea364b7adf691348c4131a92449af3c334f1 100644 (file)
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -992,7 +992,7 @@ PyTypeObject PyComplex_Type = {
        0,                                      /* tp_init */
        0,                                      /* tp_alloc */
        complex_new,                            /* tp_new */
-       _PyObject_Del,                          /* tp_free */
+       PyObject_Del,                           /* tp_free */
 };
 
 #endif

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index a03796bf187189c099af13ccaf9d13312af87d3a..54d040de22af76caf6658891e45e5a69a7f21f0b 100644 (file)
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -1631,7 +1631,7 @@ PyTypeObject PyFile_Type = {
        (initproc)file_init,                    /* tp_init */
        PyType_GenericAlloc,                    /* tp_alloc */
        file_new,                               /* tp_new */
-       _PyObject_Del,                          /* tp_free */
+       PyObject_Del,                           /* tp_free */
 };
 
 /* Interface for the 'soft space' between print items. */

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 178bd7709ef49adb725713f318649ceec006bf50..a3541e4ee9bdbc3b34531d1b16c0a62f7c2ae814 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -554,7 +554,7 @@ PyTypeObject PyClassMethod_Type = {
        cm_init,                                /* tp_init */
        PyType_GenericAlloc,                    /* tp_alloc */
        PyType_GenericNew,                      /* tp_new */
-       _PyObject_Del,                          /* tp_free */
+       PyObject_Del,                           /* tp_free */
 };
 
 PyObject *
@@ -683,7 +683,7 @@ PyTypeObject PyStaticMethod_Type = {
        sm_init,                                /* tp_init */
        PyType_GenericAlloc,                    /* tp_alloc */
        PyType_GenericNew,                      /* tp_new */
-       _PyObject_Del,                          /* tp_free */
+       PyObject_Del,                           /* tp_free */
 };
 
 PyObject *

diff --git a/Objects/longobject.c b/Objects/longobject.c
index c17d56f12c95ef26b088cd5d7f38d8482779e8f1..f11c0162947472af3ba59148ecd30a5659fd7a70 100644 (file)
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -2352,5 +2352,5 @@ PyTypeObject PyLong_Type = {
        0,                                      /* tp_init */
        0,                                      /* tp_alloc */
        long_new,                               /* tp_new */
-       _PyObject_Del,                          /* tp_free */
+       PyObject_Del,                           /* tp_free */
 };