24311913 python expat test fails after libexpat upgrade
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 19 Sep 2016 14:01:08 -0700
changeset 6929 e7955ccacd45
parent 6928 52fa7ed60803
child 6930 31ef2580c45d
24311913 python expat test fails after libexpat upgrade
components/python/python27/patches/30-expat.patch
components/python/python34/patches/28-expat.patch
components/python/python35/patches/31-expat.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python27/patches/30-expat.patch	Mon Sep 19 14:01:08 2016 -0700
@@ -0,0 +1,20 @@
+This patch comes from upstream:
+
+http://bugs.python.org/issue27369
+
+--- a/Lib/test/test_pyexpat.py
++++ b/Lib/test/test_pyexpat.py
[email protected]@ -610,11 +610,9 @@ class MalformedInputText(unittest.TestCa
+     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):
+     """
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python34/patches/28-expat.patch	Mon Sep 19 14:01:08 2016 -0700
@@ -0,0 +1,20 @@
+This patch comes from upstream:
+
+http://bugs.python.org/issue27369
+
+--- a/Lib/test/test_pyexpat.py
++++ b/Lib/test/test_pyexpat.py
[email protected]@ -662,11 +662,9 @@ class MalformedInputTest(unittest.TestCa
+         # \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):
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python35/patches/31-expat.patch	Mon Sep 19 14:01:08 2016 -0700
@@ -0,0 +1,20 @@
+This patch comes from upstream:
+
+http://bugs.python.org/issue27369
+
+--- a/Lib/test/test_pyexpat.py
++++ b/Lib/test/test_pyexpat.py
[email protected]@ -656,11 +656,9 @@ class MalformedInputTest(unittest.TestCa
+         # \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):