mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-31 15:14:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #25638: Optimized ElementTree parsing; it is now 10% faster.

Browse source
This commit is contained in:
Serhiy Storchaka 2015-12-10 09:51:53 +02:00
parent 956244bee1
commit 36ff997988
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS
View file

@ -110,6 +110,7 @@ Library
------- -------
- Issue #25638: Optimized ElementTree.iterparse(); it is now 2x faster. - Issue #25638: Optimized ElementTree.iterparse(); it is now 2x faster.
Optimized ElementTree parsing; it is now 10% faster.
- Issue #25761: Improved detecting errors in broken pickle data. - Issue #25761: Improved detecting errors in broken pickle data.

29
Modules/_elementtree.c
View file

@ -2491,10 +2491,17 @@ treebuilder_handle_start(TreeBuilderObject* self, PyObject* tag,
self->data = NULL; self->data = NULL;
} }
if (self->element_factory && self->element_factory != Py_None) { 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); node = create_new_element(tag, attrib);
} else if (attrib == Py_None) {
attrib = PyDict_New();
if (!attrib)
return NULL;
node = PyObject_CallFunction(self->element_factory, "OO", tag, attrib);
Py_DECREF(attrib);
}
else {
node = PyObject_CallFunction(self->element_factory, "OO", tag, attrib);
} }
if (!node) { if (!node) {
return NULL; return NULL;
@ -2959,12 +2966,8 @@ expat_start_handler(XMLParserObject* self, const XML_Char* tag_in,
attrib_in += 2; attrib_in += 2;
} }
} else { } else {
/* Pass an empty dictionary on */ Py_INCREF(Py_None);
attrib = PyDict_New(); attrib = Py_None;
if (!attrib) {
Py_DECREF(tag);
return;
}
} }
if (TreeBuilder_CheckExact(self->target)) { if (TreeBuilder_CheckExact(self->target)) {
@ -2973,6 +2976,14 @@ expat_start_handler(XMLParserObject* self, const XML_Char* tag_in,
tag, attrib); tag, attrib);
} }
else if (self->handle_start) { else if (self->handle_start) {
if (attrib == Py_None) {
Py_DECREF(attrib);
attrib = PyDict_New();
if (!attrib) {
Py_DECREF(tag);
return;
}
}
res = PyObject_CallFunction(self->handle_start, "OO", tag, attrib); res = PyObject_CallFunction(self->handle_start, "OO", tag, attrib);
} else } else
res = NULL; res = NULL;