diff options
| author | Eli Bendersky <eliben@gmail.com> | 2013-05-18 22:47:16 (GMT) |
|---|---|---|
| committer | Eli Bendersky <eliben@gmail.com> | 2013-05-18 22:47:16 (GMT) |
| commit | 08231a9c6aeb8315803ede4ba3fecd378cfb1e3f (patch) | |
| tree | 901d68b6602b0d6eae8bd1edd33fcdcfc3393b83 | |
| parent | 90a24270f8a76fffbce0a09fb0e879d9ac60cabe (diff) | |
| download | cpython-08231a9c6aeb8315803ede4ba3fecd378cfb1e3f.zip cpython-08231a9c6aeb8315803ede4ba3fecd378cfb1e3f.tar.gz cpython-08231a9c6aeb8315803ede4ba3fecd378cfb1e3f.tar.bz2 | |
Issue #17901: fix TreeBuilder construction for an explicit element_factory=None
Based on report and patch by Aaron Oakley.
| -rw-r--r-- | Lib/test/test_xml_etree.py | 6 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Modules/_elementtree.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index f3683f2..7e0f25a 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -1762,6 +1762,12 @@ class TreeBuilderTest(unittest.TestCase): parser.feed(self.sample1) self.assertIsNone(parser.close()) + def test_treebuilder_elementfactory_none(self): + parser = ET.XMLParser(target=ET.TreeBuilder(element_factory=None)) + parser.feed(self.sample1) + e = parser.close() + self._check_sample1_element(e) + def test_subclass(self): class MyTreeBuilder(ET.TreeBuilder): def foobar(self, x): @@ -887,6 +887,7 @@ John O'Connor Kevin O'Connor Tim O'Malley Zooko O'Whielacronx +Aaron Oakley James Oakley Jon Oberheide Pascal Oberndoerfer diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index 9caef99..a568cd3 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -2381,7 +2381,7 @@ treebuilder_handle_start(TreeBuilderObject* self, PyObject* tag, self->data = NULL; } - if (self->element_factory) { + if (self->element_factory && self->element_factory != Py_None) { node = PyObject_CallFunction(self->element_factory, "OO", tag, attrib); } else { node = create_new_element(tag, attrib); |