Issue #17901: fix TreeBuilder construction for an explicit element_factory=None

eliben · eliben · commit 20c1cdd64aba · 2013-05-18T15:47:58.000-07:00
Based on report and patch by Aaron Oakley.
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
@@ -1896,6 +1896,12 @@ class DummyBuilder(BaseDummyBuilder):
         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):
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -905,6 +905,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
@@ -2341,7 +2341,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);

Original file line number	Diff line number	Diff line change
`@@ -2341,7 +2341,7 @@ treebuilder_handle_start(TreeBuilderObject* self, PyObject* tag,`
`2341`	`2341`	`self->data = NULL;`
`2342`	`2342`	`}`
`2343`	`2343`
`2344`		`- if (self->element_factory) {`
	`2344`	`+ if (self->element_factory && self->element_factory != Py_None) {`
`2345`	`2345`	`node = PyObject_CallFunction(self->element_factory, "OO", tag, attrib);`
`2346`	`2346`	`} else {`
`2347`	`2347`	`node = create_new_element(tag, attrib);`