From: Eli Bendersky <eliben@gmail.com>
Date: Sun, 13 Jan 2013 13:26:07 +0000 (-0800)
Subject: Issue #16922: fixed findtext() to return empty Unicode string instead of empty bytes... 
X-Git-Tag: v3.3.1rc1~363
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25771b3749cac588ad2ecc8fc796a496d35769e5;p=python

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

Patch by Serhiy Storchaka.
---

diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 59a85081d8..b4edd7476f 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1773,6 +1773,9 @@ class ElementFindTest(unittest.TestCase):
         self.assertIsNone(e.findtext('tog'))
         self.assertEqual(e.findtext('tog', 'default'), 'default')
 
+        # Issue #16922
+        self.assertEqual(ET.XML('<tag><empty /></tag>').findtext('empty'), '')
+
     def test_findall(self):
         e = ET.XML(SAMPLE_XML)
         e[2] = ET.XML(SAMPLE_SECTION)
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 274c65ed1e..49441cc827 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -1129,7 +1129,7 @@ element_findtext(ElementObject *self, PyObject *args, PyObject *kwds)
 
             PyObject* text = element_get_text(item);
             if (text == Py_None)
-                return PyBytes_FromString("");
+                return PyUnicode_New(0, 0);
             Py_XINCREF(text);
             return text;
         }