Browse Source

Issue #16922: fixed findtext() to return empty Unicode string instead of empty bytes object when there's no text.

Patch by Serhiy Storchaka.
pull/2332/head
Eli Bendersky 13 years ago
parent
commit
b09b167419
  1. 2
      Lib/test/test_xml_etree.py
  2. 2
      Modules/_elementtree.c

2
Lib/test/test_xml_etree.py

@ -352,6 +352,8 @@ def find():
'subtext'
>>> ET.ElementTree(elem).findtext("section/tag")
'subtext'
>>> ET.XML('<root><empty /></root>').findtext('empty')
''
>>> summarize_list(elem.findall("."))
['body']
>>> summarize_list(elem.findall("tag"))

2
Modules/_elementtree.c

@ -840,7 +840,7 @@ element_findtext(ElementObject* self, PyObject* args)
PyObject* text = element_get_text(item);
if (text == Py_None)
return PyBytes_FromString("");
return PyUnicode_FromString("");
Py_XINCREF(text);
return text;
}

Loading…
Cancel
Save