gh-91447: Fix findtext to only give an empty string on None (GH-91486)

The API documentation for [findtext](https://docs.python.org/3/library/xml.etree.elementtree.html#xml.etree.ElementTree.Element.findtext) states that this function gives back an empty string on "no text content." With the previous implementation, this would give back a empty string even on text content values such as 0 or False. This patch attempts to resolve that by only giving back an empty string if the text attribute is set to `None`. Resolves #91447.

Automerge-Triggered-By: GH:gvanrossum
This commit is contained in:
Eugene Triguba 2022-08-01 11:52:39 -05:00 committed by GitHub
parent 858c9a58bf
commit a95e60db74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions

View File

@ -2705,6 +2705,20 @@ class BadElementPathTest(ElementTestCase, unittest.TestCase):
except ZeroDivisionError:
pass
def test_findtext_with_falsey_text_attribute(self):
root_elem = ET.Element('foo')
sub_elem = ET.SubElement(root_elem, 'bar')
falsey = ["", 0, False, [], (), {}]
for val in falsey:
sub_elem.text = val
self.assertEqual(root_elem.findtext('./bar'), val)
def test_findtext_with_none_text_attribute(self):
root_elem = ET.Element('foo')
sub_elem = ET.SubElement(root_elem, 'bar')
sub_elem.text = None
self.assertEqual(root_elem.findtext('./bar'), '')
def test_findall_with_mutating(self):
e = ET.Element('foo')
e.extend([ET.Element('bar')])

View File

@ -416,6 +416,8 @@ def findall(elem, path, namespaces=None):
def findtext(elem, path, default=None, namespaces=None):
try:
elem = next(iterfind(elem, path, namespaces))
return elem.text or ""
if elem.text is None:
return ""
return elem.text
except StopIteration:
return default

View File

@ -0,0 +1,2 @@
Fix findtext in the xml module to only give an empty string when the text
attribute is set to None.