summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Schemenauer <nascheme@enme.ucalgary.ca>2002-04-12 03:07:20 (GMT)
committerNeil Schemenauer <nascheme@enme.ucalgary.ca>2002-04-12 03:07:20 (GMT)
commit58aa861fa2cb77abbafa3f7f2f16e8dd5ce02f9d (patch)
tree62de0812f3f60ba12ef5b0bd377f9b0893f347ce
parent09a2ae58824d80ef69d4a2774d61bd6bd6da224e (diff)
downloadcpython-58aa861fa2cb77abbafa3f7f2f16e8dd5ce02f9d.zip
cpython-58aa861fa2cb77abbafa3f7f2f16e8dd5ce02f9d.tar.gz
cpython-58aa861fa2cb77abbafa3f7f2f16e8dd5ce02f9d.tar.bz2
Remove PyMalloc_*.
-rw-r--r--Objects/unicodeobject.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 52eb61d..7d917bd 100644
--- 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;