changeset:   102341:17ec4d58c046
branch:      3.4
parent:      102305:5b712993dce5
parent:      102340:1c06e02b968a
user:        Martin Panter <vadmium+py@gmail.com>
date:        Thu Jul 14 02:09:17 2016 +0000
files:       Lib/test/test_pyexpat.py Misc/NEWS
description:
Issue #27369: Merge test_pyexpat from 3.3 into 3.4


diff -r 5b712993dce5 -r 17ec4d58c046 Lib/test/test_pyexpat.py
--- a/Lib/test/test_pyexpat.py	Sun Jul 10 14:10:56 2016 -0400
+++ b/Lib/test/test_pyexpat.py	Thu Jul 14 02:09:17 2016 +0000
@@ -662,11 +662,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 5b712993dce5 -r 17ec4d58c046 Misc/NEWS
--- a/Misc/NEWS	Sun Jul 10 14:10:56 2016 -0400
+++ b/Misc/NEWS	Thu Jul 14 02:09:17 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.4.5?
 ===========================