Skip to content

Commit 2673045

Browse files
authored
[3.15] gh-158166: Make ElementTree ParseError messages strings (GH-158168) (GH-161891)
(cherry picked from commit 9894dc7)
1 parent d7b60c8 commit 2673045

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

‎Lib/test/test_xml_etree.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,6 +1129,12 @@ def test_parse_text_source_multiple_chunks(self):
11291129
xml = "<?xml version='1.0' encoding='ISO-8859-1'?><xml>%s</xml>" % body
11301130
self.assertEqual(ET.parse(io.StringIO(xml)).getroot().text, body)
11311131

1132+
def test_parse_error_msg_is_string(self):
1133+
with self.assertRaises(ET.ParseError) as cm:
1134+
ET.XML("<")
1135+
self.assertIsInstance(cm.exception.msg, str)
1136+
self.assertEqual(cm.exception.msg, "unclosed token: line 1, column 0")
1137+
11321138
def test_methods(self):
11331139
# Test serialization methods.
11341140

‎Lib/xml/etree/ElementTree.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ def handler(pi_target, data, event=event_name, append=append,
16431643
raise ValueError("unknown event %r" % event_name)
16441644

16451645
def _raiseerror(self, value):
1646-
err = ParseError(value)
1646+
err = ParseError(str(value))
16471647
err.code = value.code
16481648
err.position = value.lineno, value.offset
16491649
raise err
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix the type of the ``msg`` attribute of :exc:`xml.etree.ElementTree.ParseError` in the pure Python implementation: it is now a string, as in the C implementation.

0 commit comments

Comments
 (0)