Issue #16922: fixed findtext() to return empty Unicode string instead of empty bytes...

Patch by Serhiy Storchaka.

diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 3092f3bc11ed5080c6cedd4f647ab8d833d88e0a..f61292f546849b88dbd370930a2cfc75a730dacf 100644 (file)
--- 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
index c36af5d12616f8182992363d25046c4edfe68ec9..17d5d09962e32bd2b7fa5858bfa310fa740cada3 100644 (file)
--- 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;
         }