[Python-checkins] cpython (2.7): Issue #27369: Don’t test error message detail that changed in Expat 2.2.0

[martin.panter]

https://hg.python.org/cpython/rev/2d6e6600c210
changeset:   102342:2d6e6600c210
branch:      2.7
parent:      102333:130d97217e36
user:        Martin Panter <vadmium+py at gmail.com>
date:        Thu Jul 14 01:31:46 2016 +0000
summary:
  Issue #27369: Don’t test error message detail that changed in Expat 2.2.0

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
@@ -610,11 +610,9 @@
     def test2(self):
         xml = "<?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.assertRaisesRegexp(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 ForeignDTDTests(unittest.TestCase):
     """
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -62,6 +62,12 @@
   resulting links to use lowercase.  Patch by Sean Rodman, test by Kaushik
   Nadikuditi.
 
+Tests
+-----
+
+- Issue #27369: In test_pyexpat, avoid testing an error message detail that
+  changed in Expat 2.2.0.
+
 What's New in Python 2.7.12?
 ============================
 

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