components/python/python35/patches/31-expat.patch
author John Beck <John.Beck@Oracle.COM>
Mon, 19 Sep 2016 14:01:08 -0700
changeset 6929 e7955ccacd45
permissions -rw-r--r--
24311913 python expat test fails after libexpat upgrade
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6929
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     1
This patch comes from upstream:
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
http://bugs.python.org/issue27369
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     4
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     5
--- a/Lib/test/test_pyexpat.py
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     6
+++ b/Lib/test/test_pyexpat.py
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     7
@@ -656,11 +656,9 @@ class MalformedInputTest(unittest.TestCa
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
         # \xc2\x85 is UTF-8 encoded U+0085 (NEXT LINE)
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
         xml = b"<?xml version\xc2\x85='1.0'?>\r\n"
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
         parser = expat.ParserCreate()
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
-        try:
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
+        err_pattern = r'XML declaration not well-formed: line 1, column \d+'
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
+        with self.assertRaisesRegex(expat.ExpatError, err_pattern):
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
             parser.Parse(xml, True)
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    15
-            self.fail()
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    16
-        except expat.ExpatError as e:
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    17
-            self.assertEqual(str(e), 'XML declaration not well-formed: line 1, column 14')
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    18
 
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    19
 class ErrorMessageTest(unittest.TestCase):
e7955ccacd45 24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    20
     def test_codes(self):