8000 GH-92123: Move _elementtree heap types to module state by erlend-aasland · Pull Request #101187 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-92123: Move _elementtree heap types to module state #101187

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
merged 28 commits into from
Jan 21, 2023
Merged

GH-92123: Move _elementtree heap types to module state #101187

Changes from 1 commit
Commits
Show all changes
28 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
1ef41e1
PEP 687: Move types to state struct
erlend-aasland Jan 18, 2023
dbc4417
Sync with main
erlend-aasland Jan 20, 2023
24794dd
refactor: replace query with parameter
erlend-aasland Jan 20, 2023
6bb6511
refactor: replace query with parameter
erlend-aasland Jan 20, 2023
8dccc5a
refactor: replace query with parameter
erlend-aasland Jan 20, 2023
d10ecd0
Readability improvement
erlend-aasland Jan 20, 2023
04807e0
Merge branch 'main' into etree/move-heap-types-to-state
kumaraditya303 Jan 21, 2023
78d1676
Update Modules/_elementtree.c
erlend-aasland Jan 21, 2023
40fb571
Address review: remove etree types from globals-to-fix.tsv
erlend-aasland Jan 21, 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
refactor: replace query with parameter 
Pass state as an argument to Element_Check()
  • Loading branch information
@erlend-aasland
erlend-aasland committed Jan 20, 2023
commit 6bb6511c5b1efe05fac3df9e3b1f6ea69f4e6130
27 changes: 16 additions & 11 deletions Modules/_elementtree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ typedef struct {


#define Element_CheckExact(st, op) Py_IS_TYPE(op, (st)->Element_Type)
#define Element_Check(op) PyObject_TypeCheck(op, ET_STATE_GLOBAL->Element_Type)
#define Element_Check(st, op) PyObject_TypeCheck(op, (st)->Element_Type)


/* -------------------------------------------------------------------- */
Expand Down Expand Up @@ -505,8 +505,8 @@ LOCAL(int)
element_add_subelement(ElementObject* self, PyObject* element)
{
/* add a child element to a parent */

if (!Element_Check(element)) {
elementtreestate *st = ET_STATE_GLOBAL;
if (!Element_Check(st, element)) {
raise_type_error(element);
return -1;
}
Expand Down Expand Up @@ -816,9 +816,10 @@ _elementtree_Element___deepcopy___impl(ElementObject *self, PyObject *memo)
if (element_resize(element, self->extra->length) < 0)
goto error;

elementtreestate *st = ET_STATE_GLOBAL;
for (i = 0; i < self->extra->length; i++) {
PyObject* child = deepcopy(self->extra->children[i], memo);
if (!child || !Element_Check(child)) {
if (!child || !Element_Check(st, child)) {
if (child) {
raise_type_error(child);
Py_DECREF(child);
Expand Down Expand Up @@ -1029,9 +1030,10 @@ element_setstate_from_attributes(ElementObject *self,
}

/* Copy children */
elementtreestate *st = ET_STATE_GLOBAL;
for (i = 0; i < nchildren; i++) {
PyObject *child = PyList_GET_ITEM(children, i);
if (!Element_Check(child)) {
if (!Element_Check(st, child)) {
raise_type_error(child);
self->extra->length = i;
dealloc_extra(oldextra);
Expand Down Expand Up @@ -1229,7 +1231,7 @@ _elementtree_Element_find_impl(ElementObject *self, PyObject *path,
for (i = 0; i < self->extra->length; i++) {
PyObject* item = self->extra->children[i];
int rc;
assert(Element_Check(item));
assert(Element_Check(st, item));
Py_INCREF(item);
rc = PyObject_RichCompareBool(((ElementObject*)item)->tag, path, Py_EQ);
if (rc > 0)
Expand Down Expand Up @@ -1273,7 +1275,7 @@ _elementtree_Element_findtext_impl(ElementObject *self, PyObject *path,
for (i = 0; i < self->extra->length; i++) {
PyObject *item = self->extra->children[i];
int rc;
assert(Element_Check(item));
assert(Element_Check(st, item));
Py_INCREF(item);
rc = PyObject_RichCompareBool(((ElementObject*)item)->tag, path, Py_EQ);
if (rc > 0) {
Expand Down Expand Up @@ -1327,7 +1329,7 @@ _elementtree_Element_findall_impl(ElementObject *self, PyObject *path,
for (i = 0; i < self->extra->length; i++) {
PyObject* item = self->extra->children[i];
int rc;
assert(Element_Check(item));
assert(Element_Check(st, item));
Py_INCREF(item);
rc = PyObject_RichCompareBool(((ElementObject*)item)->tag, path, Py_EQ);
if (rc != 0 && (rc < 0 || PyList_Append(out, item) < 0)) {
Expand Down Expand Up @@ -1677,7 +1679,8 @@ element_setitem(PyObject* self_, Py_ssize_t index, PyObject* item)
old = self->extra->children[index];

if (item) {
if (!Element_Check(item)) {
elementtreestate *st = ET_STATE_GLOBAL;
if (!Element_Check(st, item)) {
raise_type_error(item);
return -1;
}
Expand Down Expand Up @@ -1874,9 +1877,10 @@ element_ass_subscr(PyObject* self_, PyObject* item, PyObject* value)
}
}

elementtreestate *st = ET_STATE_GLOBAL;
for (i = 0; i < newlen; i++) {
PyObject *element = PySequence_Fast_GET_ITEM(seq, i);
if (!Element_Check(element)) {
if (!Element_Check(st, element)) {
raise_type_error(element);
Py_DECREF(seq);
return -1;
Expand Down Expand Up @@ -2149,7 +2153,8 @@ elementiter_next(ElementIterObject *it)
continue;
}

assert(Element_Check(extra->children[child_index]));
elementtreestate *st = ET_STATE_GLOBAL;
assert(Element_Check(st, extra->children[child_index]));
elem = (ElementObject *)Py_NewRef(extra->children[child_index]);
item->child_index++;
}
Expand Down
0