Commit 4245ca0b authored by Neil Schemenauer's avatar Neil Schemenauer

Remove PyMalloc_*.

parent 9935daa1
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment