Skip to content

GH-92123: Pass _elementtree state as parameter #101189

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 11 commits into from
Jan 24, 2023
Merged

GH-92123: Pass _elementtree state as parameter #101189

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
636c7fa
Refactor: replace query with parameter
erlend-aasland Jan 20, 2023
065bcb6
Refactor: replace query with parameter
erlend-aasland Jan 20, 2023
de344e1
Refactor: replace query with parameter
erlend-aasland Jan 20, 2023
a85276e
Refactor: replace query with parameter
erlend-aasland Jan 20, 2023
ac623de
Refactor: replace query with parameter
erlend-aasland Jan 20, 2023
b7827db
Refactor: replace query with parameter
erlend-aasland Jan 20, 2023
8043112
Refactor: replace query with parameter
erlend-aasland Jan 20, 2023
53bd559
Refactor: replace query with parameter
erlend-aasland Jan 22, 2023
706385a
Refactor: replace query with parameter
erlend-aasland Jan 20, 2023
0195c35
Fix cherry-picks
erlend-aasland Jan 20, 2023
8e1e070
Apply PEP 7 to affected lines
erlend-aasland Jan 23, 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
Fix cherry-picks
  • Loading branch information
@erlend-aasland
erlend-aasland committed Jan 23, 2023
commit 0195c35ce12da7e5aa75fd259f267ea2c6c2acf4
29 changes: 15 additions & 14 deletions Modules/_elementtree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2781,10 +2781,10 @@ treebuilder_handle_comment(TreeBuilderObject* self, PyObject* text)
return NULL;

this = self->this;
elementtreestate *st = ET_STATE_GLOBAL;
if (self->insert_comments && this != Py_None) {
if (treebuilder_add_subelement(st, this, comment) < 0)
if (treebuilder_add_subelement(self->state, this, comment) < 0) {
goto error;
}
Py_XSETREF(self->last_for_tail, Py_NewRef(comment));
}
} else {
Expand Down Expand Up @@ -2821,9 +2821,8 @@ treebuilder_handle_pi(TreeBuilderObject* self, PyObject* target, PyObject* text)
}

this = self->this;
elementtreestate *st = ET_STATE_GLOBAL;
if (self->insert_pis && this != Py_None) {
if (treebuilder_add_subelement(st, this, pi) < 0)
if (treebuilder_add_subelement(self->state, this, pi) < 0)
goto error;
Py_XSETREF(self->last_for_tail, Py_NewRef(pi));
}
Expand Down Expand Up @@ -3784,7 +3783,8 @@ _check_xmlparser(XMLParserObject* self)
}

LOCAL(PyObject*)
expat_parse(XMLParserObject* self, const char* data, int data_len, int final)
expat_parse(elementtreestate *st, XMLParserObject *self, const char *data,
int data_len, int final)
{
int ok;

Expand All @@ -3795,7 +3795,6 @@ expat_parse(XMLParserObject* self, const char* data, int data_len, int final)
return NULL;

if (!ok) {
elementtreestate *st = ET_STATE_GLOBAL;
expat_set_error(
st,
EXPAT(GetErrorCode)(self->parser),
Expand Down Expand Up @@ -3825,11 +3824,11 @@ _elementtree_XMLParser_close_impl(XMLParserObject *self)
if (!_check_xmlparser(self)) {
return NULL;
}
res = expat_parse(self, "", 0, 1);
elementtreestate *st = self->state;
res = expat_parse(st, self, "", 0, 1);
if (!res)
return NULL;

elementtreestate *st = self->state;
if (TreeBuilder_CheckExact(st, self->target)) {
Py_DECREF(res);
return treebuilder_done((TreeBuilderObject*) self->target);
Expand Down Expand Up @@ -3860,6 +3859,7 @@ _elementtree_XMLParser_feed(XMLParserObject *self, PyObject *data)
if (!_check_xmlparser(self)) {
return NULL;
}
elementtreestate *st = self->state;
if (PyUnicode_Check(data)) {
Py_ssize_t data_len;
const char *data_ptr = PyUnicode_AsUTF8AndSize(data, &data_len);
Expand All @@ -3871,7 +3871,8 @@ _elementtree_XMLParser_feed(XMLParserObject *self, PyObject *data)
}
/* Explicitly set UTF-8 encoding. Return code ignored. */
(void)EXPAT(SetEncoding)(self->parser, "utf-8");
return expat_parse(self, data_ptr, (int)data_len, 0);

return expat_parse(st, self, data_ptr, (int)data_len, 0);
}
else {
Py_buffer view;
Expand All @@ -3883,7 +3884,7 @@ _elementtree_XMLParser_feed(XMLParserObject *self, PyObject *data)
PyErr_SetString(PyExc_OverflowError, "size does not fit in an int");
return NULL;
}
res = expat_parse(self, view.buf, (int)view.len, 0);
res = expat_parse(st, self, view.buf, (int)view.len, 0);
PyBuffer_Release(&view);
return res;
}
Expand Down Expand Up @@ -3915,6 +3916,7 @@ _elementtree_XMLParser__parse_whole(XMLParserObject *self, PyObject *file)
return NULL;

/* read from open file object */
elementtreestate *st = self->state;
for (;;) {

buffer = PyObject_CallFunction(reader, "i", 64*1024);
Expand Down Expand Up @@ -3952,8 +3954,8 @@ _elementtree_XMLParser__parse_whole(XMLParserObject *self, PyObject *file)
return NULL;
}
res = expat_parse(
self, PyBytes_AS_STRING(buffer), (int)PyBytes_GET_SIZE(buffer), 0
);
st, self, PyBytes_AS_STRING(buffer), (int)PyBytes_GET_SIZE(buffer),
0);

Py_DECREF(buffer);

Expand All @@ -3967,9 +3969,8 @@ _elementtree_XMLParser__parse_whole(XMLParserObject *self, PyObject *file)

Py_DECREF(reader);

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

elementtreestate *st = self->state;
if (res && TreeBuilder_CheckExact(st, self->target)) {
Py_DECREF(res);
return treebuilder_done((TreeBuilderObject*) self->target);
Expand Down