Commit 0e2f7983 authored by Jack Jansen's avatar Jack Jansen

Replaced lots of PyMem_DEL() calls with PyObject_DEL().

parent 422cdde6
...@@ -309,7 +309,7 @@ static void ...@@ -309,7 +309,7 @@ static void
navrr_dealloc(navrrobject *self) navrr_dealloc(navrrobject *self)
{ {
NavDisposeReply(&self->itself); NavDisposeReply(&self->itself);
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject * static PyObject *
......
...@@ -543,7 +543,7 @@ static void ...@@ -543,7 +543,7 @@ static void
cdr_dealloc(self) cdr_dealloc(self)
cdrobject *self; cdrobject *self;
{ {
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject * static PyObject *
...@@ -631,7 +631,7 @@ cdc_dealloc(self) ...@@ -631,7 +631,7 @@ cdc_dealloc(self)
cdcobject *self; cdcobject *self;
{ {
Py_XDECREF(self->routine); Py_XDECREF(self->routine);
PyMem_DEL(self); PyObject_DEL(self);
} }
...@@ -855,7 +855,7 @@ static void ...@@ -855,7 +855,7 @@ static void
cdf_dealloc(self) cdf_dealloc(self)
cdfobject *self; cdfobject *self;
{ {
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject * static PyObject *
......
...@@ -186,7 +186,7 @@ ctbcm_dealloc(self) ...@@ -186,7 +186,7 @@ ctbcm_dealloc(self)
CMDispose(self->hdl); CMDispose(self->hdl);
self->hdl = NULL; self->hdl = NULL;
} }
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject * static PyObject *
......
...@@ -83,7 +83,7 @@ static void HtmlObj_dealloc(self) ...@@ -83,7 +83,7 @@ static void HtmlObj_dealloc(self)
HtmlObjectObject *self; HtmlObjectObject *self;
{ {
/* Cleanup of self->ob_itself goes here */ /* Cleanup of self->ob_itself goes here */
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject *HtmlObj_HRDisposeReference(_self, _args) static PyObject *HtmlObj_HRDisposeReference(_self, _args)
......
...@@ -460,7 +460,7 @@ newiciobject(OSType creator) ...@@ -460,7 +460,7 @@ newiciobject(OSType creator)
return NULL; return NULL;
if ((err=ICStart(&self->inst, creator)) != 0 ) { if ((err=ICStart(&self->inst, creator)) != 0 ) {
(void)PyMac_Error(err); (void)PyMac_Error(err);
PyMem_DEL(self); PyObject_DEL(self);
return NULL; return NULL;
} }
return self; return self;
...@@ -471,7 +471,7 @@ static void ...@@ -471,7 +471,7 @@ static void
ici_dealloc(iciobject *self) ici_dealloc(iciobject *self)
{ {
(void)ICStop(self->inst); (void)ICStop(self->inst);
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject * static PyObject *
......
...@@ -227,7 +227,7 @@ mfsa_dealloc(mfsaobject *self) ...@@ -227,7 +227,7 @@ mfsa_dealloc(mfsaobject *self)
} }
#endif #endif
PyMem_DEL(self); PyObject_DEL(self);
} }
statichere PyTypeObject Mfsatype = { statichere PyTypeObject Mfsatype = {
...@@ -276,7 +276,7 @@ newmfsiobject(void) ...@@ -276,7 +276,7 @@ newmfsiobject(void)
static void static void
mfsi_dealloc(mfsiobject *self) mfsi_dealloc(mfsiobject *self)
{ {
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject * static PyObject *
...@@ -700,7 +700,7 @@ newmfssobject(FSSpec *fss) ...@@ -700,7 +700,7 @@ newmfssobject(FSSpec *fss)
static void static void
mfss_dealloc(mfssobject *self) mfss_dealloc(mfssobject *self)
{ {
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject * static PyObject *
...@@ -846,7 +846,7 @@ mfsr_compare(mfsrobject *v, mfsrobject *w) ...@@ -846,7 +846,7 @@ mfsr_compare(mfsrobject *v, mfsrobject *w)
static void static void
mfsr_dealloc(mfsrobject *self) mfsr_dealloc(mfsrobject *self)
{ {
PyMem_DEL(self); PyObject_DEL(self);
} }
statichere PyTypeObject Mfsrtype = { statichere PyTypeObject Mfsrtype = {
......
...@@ -259,7 +259,7 @@ static void ...@@ -259,7 +259,7 @@ static void
rf_dealloc(rfobject *self) rf_dealloc(rfobject *self)
{ {
do_close(self); do_close(self);
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject * static PyObject *
......
...@@ -117,7 +117,7 @@ sc_dealloc(self) ...@@ -117,7 +117,7 @@ sc_dealloc(self)
scobject *self; scobject *self;
{ {
DisposeSpeechChannel(self->chan); DisposeSpeechChannel(self->chan);
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject * static PyObject *
...@@ -324,7 +324,7 @@ static void ...@@ -324,7 +324,7 @@ static void
mv_dealloc(self) mv_dealloc(self)
mvobject *self; mvobject *self;
{ {
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject * static PyObject *
......
...@@ -78,7 +78,7 @@ int ScrapObj_Convert(PyObject *v, ScrapRef *p_itself) ...@@ -78,7 +78,7 @@ int ScrapObj_Convert(PyObject *v, ScrapRef *p_itself)
static void ScrapObj_dealloc(ScrapObject *self) static void ScrapObj_dealloc(ScrapObject *self)
{ {
/* Cleanup of self->ob_itself goes here */ /* Cleanup of self->ob_itself goes here */
PyMem_DEL(self); PyObject_DEL(self);
} }
static PyObject *ScrapObj_GetScrapFlavorFlags(ScrapObject *_self, PyObject *_args) static PyObject *ScrapObj_GetScrapFlavorFlags(ScrapObject *_self, PyObject *_args)
......
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