mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #16913: Fix Element.itertext()'s handling of text with XML entities.

Browse source 
Patch by Serhiy Storchaka
This commit is contained in:
Eli Bendersky 2013-01-10 06:27:53 -08:00
parent 458c0d5a77
commit e6174ca85e
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/_elementtree.c
View file

@ -2017,7 +2017,9 @@ elementiter_next(ElementIterObject *it)
PyObject_RichCompareBool(it->root_element->tag,
it->sought_tag, Py_EQ) == 1) {
if (it->gettext) {
PyObject *text = JOIN_OBJ(it->root_element->text);
PyObject *text = element_get_text(it->root_element);
if (!text)
return NULL;
if (PyObject_IsTrue(text)) {
Py_INCREF(text);
return text;
@ -2047,7 +2049,9 @@ elementiter_next(ElementIterObject *it)
}
if (it->gettext) {
PyObject *text = JOIN_OBJ(child->text);
PyObject *text = element_get_text(child);
if (!text)
return NULL;
if (PyObject_IsTrue(text)) {
Py_INCREF(text);
return text;
@ -2062,8 +2066,15 @@ elementiter_next(ElementIterObject *it)
continue;
}
else {
PyObject *tail = it->gettext ? JOIN_OBJ(cur_parent->tail) : Py_None;
PyObject *tail;
ParentLocator *next = it->parent_stack->next;
if (it->gettext) {
tail = element_get_tail(cur_parent);
if (!tail)
return NULL;
}
else
tail = Py_None;
Py_XDECREF(it->parent_stack->parent);
PyObject_Free(it->parent_stack);
it->parent_stack = next;