Skip to content

gh-92123: Convert _elementtree types to heap types #99221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erlend-aasland merged 22 commits into from
Jan 20, 2023
Merged

gh-92123: Convert _elementtree types to heap types #99221

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
76641a3
Prepare init function
Nov 20, 2020
5cbbe16
Convert element type to heap type
Nov 20, 2020
116fa39
Convert element iter type to heap type
Nov 20, 2020
a792fcf
Convert tree builder type to heap type
Nov 20, 2020
341a92d
Convert xml parser type to heap type
Nov 20, 2020
f35c604
Update clinic
Nov 20, 2020
b6573b1
Add NEWS
Nov 20, 2020
404b398
Use PyModule_AddObjectRef
Nov 20, 2020
6e53e92
Create module before creating types
Nov 20, 2020
525cfaf
Fetch type before GC
Nov 21, 2020
2448e93
Add initialisation guard
Nov 21, 2020
959a225
Address Heime's review: Don't define globals twice
Nov 23, 2020
9210a36
Visit type in type traverse functions
Jan 11, 2021
a6c6fea
Fix NEWS formatting
Jan 11, 2021
e039922
Sync with main
erlend-aasland Nov 7, 2022
b02b18e
Sync with main
erlend-aasland Jan 12, 2023
744be65
Merge branch 'main' into isolate-elementtree
erlend-aasland Jan 18, 2023
c8a3c67
Address review: make types immutable
erlend-aasland Jan 18, 2023
2175f66
Disallow instantiation for the iter type
erlend-aasland Jan 19, 2023
04aaa3d
Merge branch 'main' into isolate-elementtree
erlend-aasland Jan 19, 2023
730e5d2
Address review: fix error handling in module init
erlend-aasland Jan 19, 2023
2ccabd0
Merge branch 'main' into isolate-elementtree
erlend-aasland Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Convert xml parser type to heap type
  • Loading branch information
Erlend E. Aasland committed Jan 11, 2021
commit 341a92ddaf8a065339d779a22374ce46db18ba75
74 changes: 28 additions & 46 deletions Modules/_elementtree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static void _clear_joined_ptr(PyObject **p)
static PyTypeObject *Element_Type;
static PyTypeObject *ElementIter_Type;
static PyTypeObject *TreeBuilder_Type;
static PyTypeObject XMLParser_Type;
static PyTypeObject *XMLParser_Type;


/* Per-module state; PEP 3121 */
Expand Down Expand Up @@ -383,7 +383,7 @@ get_attrib_from_keywords(PyObject *kwds)
module _elementtree
class _elementtree.Element "ElementObject *" "Element_Type"
class _elementtree.TreeBuilder "TreeBuilderObject *" "TreeBuilder_Type"
class _elementtree.XMLParser "XMLParserObject *" "&XMLParser_Type"
class _elementtree.XMLParser "XMLParserObject *" "XMLParser_Type"
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=f56d497fee3f9c95]*/

Expand Down Expand Up @@ -3786,7 +3786,10 @@ xmlparser_dealloc(XMLParserObject* self)
{
PyObject_GC_UnTrack(self);
xmlparser_gc_clear(self);
Py_TYPE(self)->tp_free((PyObject *)self);

PyTypeObject *tp = Py_TYPE(self);
tp->tp_free(self);
Py_DECREF(tp);
}

Py_LOCAL_INLINE(int)
Expand Down Expand Up @@ -4254,48 +4257,28 @@ static PyMethodDef xmlparser_methods[] = {
{NULL, NULL}
};

static PyTypeObject XMLParser_Type = {
PyVarObject_HEAD_INIT(NULL, 0)
"xml.etree.ElementTree.XMLParser", sizeof(XMLParserObject), 0,
/* methods */
(destructor)xmlparser_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
/* tp_flags */
0, /* tp_doc */
(traverseproc)xmlparser_gc_traverse, /* tp_traverse */
(inquiry)xmlparser_gc_clear, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
xmlparser_methods, /* tp_methods */
xmlparser_members, /* tp_members */
xmlparser_getsetlist, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
_elementtree_XMLParser___init__, /* tp_init */
PyType_GenericAlloc, /* tp_alloc */
xmlparser_new, /* tp_new */
0, /* tp_free */
static PyType_Slot xmlparser_slots[] = {
{Py_tp_dealloc, xmlparser_dealloc},
{Py_tp_traverse, xmlparser_gc_traverse},
{Py_tp_clear, xmlparser_gc_clear},
{Py_tp_methods, xmlparser_methods},
{Py_tp_members, xmlparser_members},
{Py_tp_getset, xmlparser_getsetlist},
{Py_tp_init, _elementtree_XMLParser___init__},
{Py_tp_alloc, PyType_GenericAlloc},
{Py_tp_new, xmlparser_new},
{0, NULL},
};

static PyType_Spec xmlparser_spec = {
.name = "xml.etree.ElementTree.XMLParser",
.basicsize = sizeof(XMLParserObject),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
.slots = xmlparser_slots,
};

static PyTypeObject *XMLParser_Type = NULL;

/* ==================================================================== */
/* python module interface */

Expand Down Expand Up @@ -4342,8 +4325,7 @@ PyInit__elementtree(void)
CREATE_TYPE(m, ElementIter_Type, &elementiter_spec);
CREATE_TYPE(m, TreeBuilder_Type, &treebuilder_spec);
CREATE_TYPE(m, Element_Type, &element_spec);
if (PyType_Ready(&XMLParser_Type) < 0)
goto error;
CREATE_TYPE(m, XMLParser_Type, &xmlparser_spec);

m = PyModule_Create(&elementtreemodule);
if (!m)
Expand Down Expand Up @@ -4391,7 +4373,7 @@ PyInit__elementtree(void)
PyTypeObject *types[] = {
Element_Type,
TreeBuilder_Type,
&XMLParser_Type
XMLParser_Type
};

for (size_t i = 0; i < Py_ARRAY_LENGTH(types); i++) {
Expand Down