summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-02-08 11:40:40 (GMT)
committerGitHub <noreply@github.com>2023-02-08 11:40:40 (GMT)
commitc51cd54b6560879c35ec6d36f8ec72194c4f27a9 (patch)
tree65e408e2a9948a749e71006625e3afcdb68bed83
parenta0b7c3fd2a957174550eca430590f3345b595cd8 (diff)
downloadcpython-c51cd54b6560879c35ec6d36f8ec72194c4f27a9.zip
cpython-c51cd54b6560879c35ec6d36f8ec72194c4f27a9.tar.gz
cpython-c51cd54b6560879c35ec6d36f8ec72194c4f27a9.tar.bz2
[3.10] gh-100933: Improve `check_element` helper in `test_xml_etree` (GH-100934) (#101687)
Items checked by this test are always `str` and `dict` instances. (cherry picked from commit eb49d32b9af0b3b01a5588626179187f11d145c9) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
-rw-r--r--Lib/test/test_xml_etree.py27
1 files changed, 4 insertions, 23 deletions
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index d7b5e52..940e026 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -203,25 +203,6 @@ class ElementTreeTest(unittest.TestCase):
def test_interface(self):
# Test element tree interface.
- def check_string(string):
- len(string)
- for char in string:
- self.assertEqual(len(char), 1,
- msg="expected one-character string, got %r" % char)
- new_string = string + ""
- new_string = string + " "
- string[:0]
-
- def check_mapping(mapping):
- len(mapping)
- keys = mapping.keys()
- items = mapping.items()
- for key in keys:
- item = mapping[key]
- mapping["key"] = "value"
- self.assertEqual(mapping["key"], "value",
- msg="expected value string, got %r" % mapping["key"])
-
def check_element(element):
self.assertTrue(ET.iselement(element), msg="not an element")
direlem = dir(element)
@@ -231,12 +212,12 @@ class ElementTreeTest(unittest.TestCase):
self.assertIn(attr, direlem,
msg='no %s visible by dir' % attr)
- check_string(element.tag)
- check_mapping(element.attrib)
+ self.assertIsInstance(element.tag, str)
+ self.assertIsInstance(element.attrib, dict)
if element.text is not None:
- check_string(element.text)
+ self.assertIsInstance(element.text, str)
if element.tail is not None:
- check_string(element.tail)
+ self.assertIsInstance(element.tail, str)
for elem in element:
check_element(elem)