[Python-checkins] cpython (merge 3.2 -> 3.3): Issue #27369: Merge test_pyexpat from 3.2 into 3.3
martin.panter
python-checkins at python.org
Wed Jul 13 23:37:14 EDT 2016
https://hg.python.org/cpython/rev/1c06e02b968a
changeset: 102340:1c06e02b968a
branch: 3.3
parent: 102304:1c07bd735282
parent: 102339:5b64175c6c24
user: Martin Panter <vadmium+py at gmail.com>
date: Thu Jul 14 01:42:53 2016 +0000
summary:
Issue #27369: Merge test_pyexpat from 3.2 into 3.3
files:
Lib/test/test_pyexpat.py | 6 ++----
Misc/NEWS | 3 +++
2 files changed, 5 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
@@ -603,11 +603,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
@@ -60,6 +60,9 @@
Tests
-----
+- Issue #27369: In test_pyexpat, avoid testing an error message detail that
+ changed in Expat 2.2.0.
+
- Issue #25940: Changed test_ssl and test_httplib to use
self-signed.pythontest.net. This avoids relying on svn.python.org, which
recently changed root certificate.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list