traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix reference counting of iconvcodec_Type. Fixes #670715. 

Remove GC code; the base type does not need GC.
This commit is contained in:
Martin v. Löwis 2003-01-27 11:39:04 +00:00
parent ca87aefe83
commit 7a565f0b9b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/_iconv_codec.c
View File

@ -533,8 +533,6 @@ errorexit:
static void static void
iconvcodec_dealloc(iconvcodecObject *self) iconvcodec_dealloc(iconvcodecObject *self)
{ {
_PyObject_GC_UNTRACK(self);
if (self->enchdl != (iconv_t)-1) if (self->enchdl != (iconv_t)-1)
iconv_close(self->enchdl); iconv_close(self->enchdl);
if (self->dechdl != (iconv_t)-1) if (self->dechdl != (iconv_t)-1)
@ -542,7 +540,7 @@ iconvcodec_dealloc(iconvcodecObject *self)
if (self->encoding != NULL) if (self->encoding != NULL)
PyMem_Free(self->encoding); PyMem_Free(self->encoding);
PyObject_GC_Del(self); self->ob_type->tp_free((PyObject *)self);
} }
static PyObject * static PyObject *
@ -573,8 +571,7 @@ statichere PyTypeObject iconvcodec_Type = {
PyObject_GenericGetAttr, /* tp_getattro */ PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
Py_TPFLAGS_HAVE_GC, /* tp_flags */
iconvcodec_doc, /* tp_doc */ iconvcodec_doc, /* tp_doc */
0, /* tp_traverse */ 0, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
@ -593,7 +590,7 @@ statichere PyTypeObject iconvcodec_Type = {
0, /* tp_init */ 0, /* tp_init */
PyType_GenericAlloc, /* tp_alloc */ PyType_GenericAlloc, /* tp_alloc */
iconvcodec_new, /* tp_new */ iconvcodec_new, /* tp_new */
PyObject_GC_Del, /* tp_free */ PyObject_Del, /* tp_free */
}; };
static struct PyMethodDef _iconv_codec_methods[] = { static struct PyMethodDef _iconv_codec_methods[] = {
@ -608,6 +605,7 @@ init_iconv_codec(void)
m = Py_InitModule("_iconv_codec", _iconv_codec_methods); m = Py_InitModule("_iconv_codec", _iconv_codec_methods);
PyModule_AddStringConstant(m, "__version__", (char*)__version__); PyModule_AddStringConstant(m, "__version__", (char*)__version__);
Py_INCREF(&iconvcodec_Type);
PyModule_AddObject(m, "iconvcodec", (PyObject *)(&iconvcodec_Type)); PyModule_AddObject(m, "iconvcodec", (PyObject *)(&iconvcodec_Type));
PyModule_AddStringConstant(m, "internal_encoding", UNICODE_ENCODING); PyModule_AddStringConstant(m, "internal_encoding", UNICODE_ENCODING);