[Python-checkins] cpython (merge 3.3 -> default): Issue #17901: fix TreeBuilder construction for an explicit element_factory=None
eli.bendersky
python-checkins at python.org
Sun May 19 00:48:07 CEST 2013
http://hg.python.org/cpython/rev/e79df5d1f680
changeset: 83834:e79df5d1f680
parent: 83832:23836f17e4a2
parent: 83833:c430bea30457
user: Eli Bendersky <eliben at gmail.com>
date: Sat May 18 15:47:58 2013 -0700
summary:
Issue #17901: fix TreeBuilder construction for an explicit element_factory=None
Based on report and patch by Aaron Oakley.
files:
Lib/test/test_xml_etree.py | 6 ++++++
Misc/ACKS | 1 +
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
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1896,6 +1896,12 @@
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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -905,6 +905,7 @@
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
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -2341,7 +2341,7 @@
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);
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list