Skip to content

GH-92123: Store _elementtree state in type contexts#101190

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 2 commits into from
Jan 23, 2023
Merged

GH-92123: Store _elementtree state in type contexts #101190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd92ea2
Store state in TreeBuilderObject context
erlend-aasland Jan 20, 2023
4f0f2ff
Store state in XMLParserObject context
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
38 changes: 21 additions & 17 deletions Modules/_elementtree.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2289,6 +2289,7 @@ typedef struct{

char insert_comments;
char insert_pis;
elementtreestate *state;
} TreeBuilderObject;

#define TreeBuilder_CheckExact(st, op) Py_IS_TYPE((op), (st)->TreeBuilder_Type)
Expand DownExpand Up@@ -2322,6 +2323,7 @@ treebuilder_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
t->start_ns_event_obj = t->end_ns_event_obj = NULL;
t->comment_event_obj = t->pi_event_obj = NULL;
t->insert_comments = t->insert_pis = 0;
t->state = ET_STATE_GLOBAL;
}
return (PyObject *)t;
}
Expand DownExpand Up@@ -2353,7 +2355,7 @@ _elementtree_TreeBuilder___init___impl(TreeBuilderObject *self,
}

if (comment_factory == Py_None){
elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
comment_factory = st->comment_factory;
}
if (comment_factory){
Expand All@@ -2365,7 +2367,7 @@ _elementtree_TreeBuilder___init___impl(TreeBuilderObject *self,
}

if (pi_factory == Py_None){
elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
pi_factory = st->pi_factory;
}
if (pi_factory){
Expand DownExpand Up@@ -2547,7 +2549,7 @@ treebuilder_flush_data(TreeBuilderObject* self)
if (!self->data){
return 0;
}
elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (!self->last_for_tail){
PyObject *element = self->last;
return treebuilder_extend_element_text_or_tail(
Expand DownExpand Up@@ -2607,7 +2609,7 @@ treebuilder_handle_start(TreeBuilderObject* self, PyObject* tag,
{
PyObject* node;
PyObject* this;
elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;

if (treebuilder_flush_data(self) < 0){
return NULL;
Expand DownExpand Up@@ -2996,6 +2998,7 @@ typedef struct{

PyObject *handle_close;

elementtreestate *state;
} XMLParserObject;

/* helpers */
Expand DownExpand Up@@ -3141,7 +3144,7 @@ expat_default_handler(XMLParserObject* self, const XML_Char* data_in,
value = PyDict_GetItemWithError(self->entity, key);

if (value){
elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (TreeBuilder_CheckExact(st, self->target))
res = treebuilder_handle_data(
(TreeBuilderObject*) self->target, value
Expand DownExpand Up@@ -3214,7 +3217,7 @@ expat_start_handler(XMLParserObject* self, const XML_Char* tag_in,
attrib = NULL;
}

elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (TreeBuilder_CheckExact(st, self->target)){
/* shortcut */
res = treebuilder_handle_start((TreeBuilderObject*) self->target,
Expand DownExpand Up@@ -3253,7 +3256,7 @@ expat_data_handler(XMLParserObject* self, const XML_Char* data_in,
if (!data)
return; /* parser will look for errors */

elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (TreeBuilder_CheckExact(st, self->target))
/* shortcut */
res = treebuilder_handle_data((TreeBuilderObject*) self->target, data);
Expand All@@ -3276,7 +3279,7 @@ expat_end_handler(XMLParserObject* self, const XML_Char* tag_in)
if (PyErr_Occurred())
return;

elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (TreeBuilder_CheckExact(st, self->target))
/* shortcut */
/* the standard tree builder doesn't look at the end tag */
Expand DownExpand Up@@ -3311,7 +3314,7 @@ expat_start_ns_handler(XMLParserObject* self, const XML_Char* prefix_in,
if (!prefix_in)
prefix_in = ""

elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (TreeBuilder_CheckExact(st, self->target)){
/* shortcut - TreeBuilder does not actually implement .start_ns() */
TreeBuilderObject *target = (TreeBuilderObject*) self->target;
Expand DownExpand Up@@ -3362,7 +3365,7 @@ expat_end_ns_handler(XMLParserObject* self, const XML_Char* prefix_in)
if (!prefix_in)
prefix_in = ""

elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (TreeBuilder_CheckExact(st, self->target)){
/* shortcut - TreeBuilder does not actually implement .end_ns() */
TreeBuilderObject *target = (TreeBuilderObject*) self->target;
Expand DownExpand Up@@ -3391,7 +3394,7 @@ expat_comment_handler(XMLParserObject* self, const XML_Char* comment_in)
if (PyErr_Occurred())
return;

elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (TreeBuilder_CheckExact(st, self->target)){
/* shortcut */
TreeBuilderObject *target = (TreeBuilderObject*) self->target;
Expand DownExpand Up@@ -3452,7 +3455,7 @@ expat_start_doctype_handler(XMLParserObject *self,
pubid_obj = Py_NewRef(Py_None);
}

elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
/* If the target has a handler for doctype, call it. */
if (self->handle_doctype){
res = PyObject_CallFunctionObjArgs(self->handle_doctype,
Expand DownExpand Up@@ -3485,7 +3488,7 @@ expat_pi_handler(XMLParserObject* self, const XML_Char* target_in,
if (PyErr_Occurred())
return;

elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (TreeBuilder_CheckExact(st, self->target)){
/* shortcut */
TreeBuilderObject *target = (TreeBuilderObject*) self->target;
Expand DownExpand Up@@ -3538,6 +3541,7 @@ xmlparser_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self->handle_start = self->handle_data = self->handle_end = NULL;
self->handle_comment = self->handle_pi = self->handle_close = NULL;
self->handle_doctype = NULL;
self->state = ET_STATE_GLOBAL;
}
return (PyObject *)self;
}
Expand DownExpand Up@@ -3594,7 +3598,7 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *target,
if (target != Py_None){
Py_INCREF(target);
} else{
elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
target = treebuilder_new(st->TreeBuilder_Type, NULL, NULL);
if (!target){
Py_CLEAR(self->entity);
Expand DownExpand Up@@ -3796,7 +3800,7 @@ _elementtree_XMLParser_close_impl(XMLParserObject *self)
if (!res)
return NULL;

elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (TreeBuilder_CheckExact(st, self->target)){
Py_DECREF(res);
return treebuilder_done((TreeBuilderObject*) self->target);
Expand DownExpand Up@@ -3936,7 +3940,7 @@ _elementtree_XMLParser__parse_whole(XMLParserObject *self, PyObject *file)

res = expat_parse(self, "", 0, 1);

elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (res && TreeBuilder_CheckExact(st, self->target)){
Py_DECREF(res);
return treebuilder_done((TreeBuilderObject*) self->target);
Expand DownExpand Up@@ -3968,7 +3972,7 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self,
if (!_check_xmlparser(self)){
return NULL;
}
elementtreestate *st = ET_STATE_GLOBAL;
elementtreestate *st = self->state;
if (!TreeBuilder_CheckExact(st, self->target)){
PyErr_SetString(
PyExc_TypeError,
Expand Down