[Python-checkins] cpython (merge 3.5 -> default): Issue #27369: Merge test_pyexpat from 3.5

martin.panter python-checkins at python.org
Wed Jul 13 23:37:20 EDT 2016


https://hg.python.org/cpython/rev/31dc480102fc
changeset:   102344:31dc480102fc
parent:      102337:c821709a9275
parent:      102343:0fbf3b88eed8
user:        Martin Panter <vadmium+py at gmail.com>
date:        Thu Jul 14 03:36:53 2016 +0000
summary:
  Issue #27369: Merge test_pyexpat from 3.5

files:
  Lib/test/test_pyexpat.py |  6 ++----
  Misc/NEWS                |  6 ++++++
  2 files changed, 8 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py
--- a/Lib/test/test_pyexpat.py
+++ b/Lib/test/test_pyexpat.py
@@ -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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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
 ==================================

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list