Store state in ElementObject context

Author: erlend-aasland

Lib/test/test_xml_etree_c.py

@@ -232,7 +232,7 @@ def test_parser_comes_from_C(self):
 @support.cpython_only
 class SizeofTest(unittest.TestCase):
     def setUp(self):
-        self.elementsize = support.calcobjsize('5P')
+        self.elementsize = support.calcobjsize('6P')
         # extra
         self.extra = struct.calcsize('PnnP4P')
 

Modules/_elementtree.c

@@ -230,6 +230,7 @@ typedef struct {
 
     PyObject *weakreflist; /* For tp_weaklistoffset */
 
+    elementtreestate *state;
 } ElementObject;
 
 
@@ -309,6 +310,7 @@ create_new_element(elementtreestate *st, PyObject *tag, PyObject *attrib)
     self->text = Py_NewRef(Py_None);
     self->tail = Py_NewRef(Py_None);
     self->weakreflist = NULL;
+    self->state = ET_STATE_GLOBAL;
 
     PyObject_GC_Track(self);
 
@@ -332,6 +334,7 @@ element_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         e->tail = Py_NewRef(Py_None);
         e->extra = NULL;
         e->weakreflist = NULL;
+        e->state = ET_STATE_GLOBAL;
     }
     return (PyObject *)e;
 }
@@ -418,6 +421,7 @@ element_init(PyObject *self, PyObject *args, PyObject *kwds)
     }
 
     self_elem = (ElementObject *)self;
+    self_elem->state = ET_STATE_GLOBAL;
 
     if (attrib != NULL && !is_empty_dict(attrib)) {
         if (create_extra(self_elem, attrib) < 0) {
@@ -506,7 +510,7 @@ LOCAL(int)
 element_add_subelement(ElementObject* self, PyObject* element)
 {
     /* add a child element to a parent */
-    elementtreestate *st = ET_STATE_GLOBAL;
+    elementtreestate *st = self->state;
     if (!Element_Check(st, element)) {
         raise_type_error(element);
         return -1;
@@ -727,7 +731,7 @@ _elementtree_Element___copy___impl(ElementObject *self)
 {
     Py_ssize_t i;
     ElementObject* element;
-    elementtreestate *st = ET_STATE_GLOBAL;
+    elementtreestate *st = self->state;
 
     element = (ElementObject*) create_new_element(
         st, self->tag, self->extra ? self->extra->attrib : NULL);
@@ -781,7 +785,7 @@ _elementtree_Element___deepcopy___impl(ElementObject *self, PyObject *memo)
     PyObject* tail;
     PyObject* id;
 
-    elementtreestate *st = ET_STATE_GLOBAL;
+    elementtreestate *st = self->state;
     tag = deepcopy(st, self->tag, memo);
     if (!tag)
         return NULL;
@@ -1031,7 +1035,7 @@ element_setstate_from_attributes(ElementObject *self,
         }
 
         /* Copy children */
-        elementtreestate *st = ET_STATE_GLOBAL;
+        elementtreestate *st = self->state;
         for (i = 0; i < nchildren; i++) {
             PyObject *child = PyList_GET_ITEM(children, i);
             if (!Element_Check(st, child)) {
@@ -1218,7 +1222,7 @@ _elementtree_Element_find_impl(ElementObject *self, PyObject *path,
 /*[clinic end generated code: output=41b43f0f0becafae input=359b6985f6489d2e]*/
 {
     Py_ssize_t i;
-    elementtreestate *st = ET_STATE_GLOBAL;
+    elementtreestate *st = self->state;
 
     if (checkpath(path) || namespaces != Py_None) {
         return PyObject_CallMethodObjArgs(
@@ -1261,7 +1265,7 @@ _elementtree_Element_findtext_impl(ElementObject *self, PyObject *path,
 /*[clinic end generated code: output=83b3ba4535d308d2 input=b53a85aa5aa2a916]*/
 {
     Py_ssize_t i;
-    elementtreestate *st = ET_STATE_GLOBAL;
+    elementtreestate *st = self->state;
 
     if (checkpath(path) || namespaces != Py_None)
         return PyObject_CallMethodObjArgs(
@@ -1312,7 +1316,7 @@ _elementtree_Element_findall_impl(ElementObject *self, PyObject *path,
 {
     Py_ssize_t i;
     PyObject* out;
-    elementtreestate *st = ET_STATE_GLOBAL;
+    elementtreestate *st = self->state;
 
     if (checkpath(path) || namespaces != Py_None) {
         return PyObject_CallMethodObjArgs(
@@ -1358,7 +1362,7 @@ _elementtree_Element_iterfind_impl(ElementObject *self, PyObject *path,
 /*[clinic end generated code: output=ecdd56d63b19d40f input=abb974e350fb65c7]*/
 {
     PyObject* tag = path;
-    elementtreestate *st = ET_STATE_GLOBAL;
+    elementtreestate *st = self->state;
 
     return PyObject_CallMethodObjArgs(
         st->elementpath_obj, st->str_iterfind, self, tag, namespaces, NULL);
@@ -1549,7 +1553,7 @@ _elementtree_Element_makeelement_impl(ElementObject *self, PyObject *tag,
     if (!attrib)
         return NULL;
 
-    elementtreestate *st = ET_STATE_GLOBAL;
+    elementtreestate *st = self->state;
     elem = create_new_element(st, tag, attrib);
 
     Py_DECREF(attrib);
@@ -1681,7 +1685,7 @@ element_setitem(PyObject* self_, Py_ssize_t index, PyObject* item)
     old = self->extra->children[index];
 
     if (item) {
-        elementtreestate *st = ET_STATE_GLOBAL;
+        elementtreestate *st = self->state;
         if (!Element_Check(st, item)) {
             raise_type_error(item);
             return -1;
@@ -1879,7 +1883,7 @@ element_ass_subscr(PyObject* self_, PyObject* item, PyObject* value)
             }
         }
 
-        elementtreestate *st = ET_STATE_GLOBAL;
+        elementtreestate *st = self->state;
         for (i = 0; i < newlen; i++) {
             PyObject *element = PySequence_Fast_GET_ITEM(seq, i);
             if (!Element_Check(st, element)) {
@@ -2156,7 +2160,7 @@ elementiter_next(ElementIterObject *it)
             }
 
 #ifndef NDEBUG
-            elementtreestate *st = ET_STATE_GLOBAL;
+            elementtreestate *st = elem->state;
             assert(Element_Check(st, extra->children[child_index]));
 #endif
             elem = (ElementObject *)Py_NewRef(extra->children[child_index]);
@@ -2233,7 +2237,7 @@ create_elementiter(ElementObject *self, PyObject *tag, int gettext)
 {
     ElementIterObject *it;
 
-    elementtreestate *st = ET_STATE_GLOBAL;
+    elementtreestate *st = self->state;
     it = PyObject_GC_New(ElementIterObject, st->ElementIter_Type);
     if (!it)
         return NULL;