Remove PyMalloc_*.

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 52eb61d7f1d08d03f51c0d41c8c3cdfc8659d62a..7d917bd4538b6d0d97446eeb02f8d2fa7ee7409f 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -201,7 +201,7 @@ PyUnicodeObject *_PyUnicode_New(int length)
         PyObject_INIT(unicode, &PyUnicode_Type);
     }
     else {
-        unicode = PyMalloc_New(PyUnicodeObject, &PyUnicode_Type);
+        unicode = PyObject_New(PyUnicodeObject, &PyUnicode_Type);
         if (unicode == NULL)
             return NULL;
        unicode->str = PyMem_NEW(Py_UNICODE, length + 1);
@@ -219,7 +219,7 @@ PyUnicodeObject *_PyUnicode_New(int length)
 
  onError:
     _Py_ForgetReference((PyObject *)unicode);
-    PyMalloc_Del(unicode);
+    PyObject_Del(unicode);
     return NULL;
 }
 
@@ -5718,7 +5718,7 @@ unicode_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        pnew->str = PyMem_NEW(Py_UNICODE, n+1);
        if (pnew->str == NULL) {
                _Py_ForgetReference((PyObject *)pnew);
-               PyMalloc_Del(pnew);
+               PyObject_Del(pnew);
                return NULL;
        }
        Py_UNICODE_COPY(pnew->str, tmp->str, n+1);
@@ -5776,7 +5776,7 @@ PyTypeObject PyUnicode_Type = {
     0,                                 /* tp_init */
     0,                                 /* tp_alloc */
     unicode_new,                       /* tp_new */
-    _PyMalloc_Del,                     /* tp_free */
+    PyObject_Del,                      /* tp_free */
 };
 
 /* Initialize the Unicode implementation */
@@ -5818,7 +5818,7 @@ _PyUnicode_Fini(void)
        if (v->str)
            PyMem_DEL(v->str);
        Py_XDECREF(v->defenc);
-       PyMalloc_Del(v);
+       PyObject_Del(v);
     }
     unicode_freelist = NULL;
     unicode_freelist_size = 0;