Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions Lib/test/test_xml_etree.py
Original file line number Diff line number Diff line change
Expand Up @@ -4339,6 +4339,53 @@ def test_treebuilder_elementfactory_none(self):
e = parser.close()
self._check_sample1_element(e)

def test_start_copies_attrs(self):
class DictSubclass(dict):
pass

for dict_type in (dict, DictSubclass):
for initial in ({}, {'key': 'value'}):
for factory in (None, ET.Element):
with self.subTest(dict_type=dict_type, initial=initial,
factory=factory):
attrs = dict_type(initial)
tb = ET.TreeBuilder(element_factory=factory)
elem = tb.start('root', attrs)
tb.end('root')
self.assertIs(tb.close(), elem)
attrs.clear()
attrs['caller'] = 'changed'
self.assertEqual(elem.attrib, initial)
elem.set('element', 'changed')
self.assertEqual(attrs, {'caller': 'changed'})

def test_start_reuses_attrs(self):
tb = ET.TreeBuilder()
root = tb.start('root', {})
attrs = {'id': 'first'}
tb.start('child', attrs)
tb.end('child')
attrs['id'] = 'second'
tb.start('child', attrs)
tb.end('child')
tb.end('root')
self.assertIs(tb.close(), root)
self.assertEqual([child.get('id') for child in root],
['first', 'second'])

def test_start_element_factory_attrs(self):
attrs = {'key': 'value'}

def factory(tag, attrib):
self.assertIs(attrib, attrs)
return ET.Element(tag, attrib)

tb = ET.TreeBuilder(element_factory=factory)
elem = tb.start('root', attrs)
tb.end('root')
self.assertIs(tb.close(), elem)
self.assertEqual(elem.attrib, attrs)

def test_subclass(self):
class MyTreeBuilder(ET.TreeBuilder):
def foobar(self, x):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :meth:`xml.etree.ElementTree.TreeBuilder.start` sharing the input attribute
dictionary with created elements when using the default element factory.
9 changes: 9 additions & 0 deletions Modules/_elementtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -3116,6 +3116,15 @@ _elementtree_TreeBuilder_start_impl(TreeBuilderObject *self, PyObject *tag,
PyObject *attrs)
/*[clinic end generated code: output=e7e9dc2861349411 input=26cccb49c3b8b12f]*/
{
if (!self->element_factory) {
attrs = PyDict_Copy(attrs);
if (attrs == NULL) {
return NULL;
}
PyObject *node = treebuilder_handle_start(self, tag, attrs);
Py_DECREF(attrs);
return node;
}
return treebuilder_handle_start(self, tag, attrs);
}

Expand Down
Loading