Issue #16922: fixed findtext() to return empty Unicode string instead…

… of empty bytes object when there's no text. Patch by Serhiy Storchaka.
python · Jan 13, 2013 · b09b167 · b09b167
1 parent ce1519d
commit b09b167
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Lib/test/test_xml_etree.py b/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"))

diff --git a/Modules/_elementtree.c b/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;
         }