changeset:   102343:0fbf3b88eed8
branch:      3.5
parent:      102336:6c7f356737a8
parent:      102341:17ec4d58c046
user:        Martin Panter <vadmium+py@gmail.com>
date:        Thu Jul 14 03:35:15 2016 +0000
files:       Lib/test/test_pyexpat.py Misc/NEWS
description:
Issue #27369: Merge test_pyexpat from 3.4 into 3.5


diff -r 6c7f356737a8 -r 0fbf3b88eed8 Lib/test/test_pyexpat.py
--- a/Lib/test/test_pyexpat.py	Wed Jul 13 19:58:21 2016 -0700
+++ b/Lib/test/test_pyexpat.py	Thu Jul 14 03:35:15 2016 +0000
@@ -656,11 +656,9 @@
         # \xc2\x85 is UTF-8 encoded U+0085 (NEXT LINE)
         xml = b"<?xml version\xc2\x85='1.0'?>\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 6c7f356737a8 -r 0fbf3b88eed8 Misc/NEWS
--- a/Misc/NEWS	Wed Jul 13 19:58:21 2016 -0700
+++ b/Misc/NEWS	Thu Jul 14 03:35:15 2016 +0000
@@ -90,6 +90,12 @@
 - Issue #26754: PyUnicode_FSDecoder() accepted a filename argument encoded as
   an iterable of integers. Now only strings and bytes-like objects are accepted.
 
+Tests
+-----
+
+- Issue #27369: In test_pyexpat, avoid testing an error message detail that
+  changed in Expat 2.2.0.
+
 Tools/Demos
 -----------