(original) (raw)

changeset: 102344:31dc480102fc parent: 102337:c821709a9275 parent: 102343:0fbf3b88eed8 user: Martin Panter vadmium+py@gmail.com date: Thu Jul 14 03:36:53 2016 +0000 files: Misc/NEWS description: Issue #27369: Merge test_pyexpat from 3.5 diff -r c821709a9275 -r 31dc480102fc Lib/test/test_pyexpat.py --- a/Lib/test/test_pyexpat.py Wed Jul 13 19:58:47 2016 -0700 +++ b/Lib/test/test_pyexpat.py Thu Jul 14 03:36:53 2016 +0000 @@ -656,11 +656,9 @@ # \xc2\x85 is UTF-8 encoded U+0085 (NEXT LINE) xml = b"\r\n" parser = expat.ParserCreate() - try: + err_pattern = r'XML declaration not well-formed: line 1, column \d+' + with self.assertRaisesRegex(expat.ExpatError, err_pattern): parser.Parse(xml, True) - self.fail() - except expat.ExpatError as e: - self.assertEqual(str(e), 'XML declaration not well-formed: line 1, column 14') class ErrorMessageTest(unittest.TestCase): def test_codes(self): diff -r c821709a9275 -r 31dc480102fc Misc/NEWS --- a/Misc/NEWS Wed Jul 13 19:58:47 2016 -0700 +++ b/Misc/NEWS Thu Jul 14 03:36:53 2016 +0000 @@ -13,6 +13,12 @@ Library ------- +Tests +----- + +- Issue #27369: In test_pyexpat, avoid testing an error message detail that + changed in Expat 2.2.0. + What's New in Python 3.6.0 alpha 3 ================================== /vadmium+py@gmail.com