| author | pkidd <patrick.kidd@oracle.com> |
| Fri, 24 Feb 2017 07:31:04 -0800 | |
| branch | s11u3-sru |
| changeset 7693 | 789db572fc03 |
| parent 7405 | 9f5266ce04c7 |
| permissions | -rw-r--r-- |
|
7405
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
This patch comes from upstream: |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
|
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
http://bugs.python.org/issue27369 |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
|
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
--- a/Lib/test/test_pyexpat.py |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
+++ b/Lib/test/test_pyexpat.py |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
@@ -633,11 +633,9 @@ class MalformedInputTest(unittest.TestCa |
|
9f5266ce04c7
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) |
|
9f5266ce04c7
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" |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
parser = expat.ParserCreate() |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
- try: |
|
9f5266ce04c7
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+' |
|
9f5266ce04c7
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): |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
parser.Parse(xml, True) |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
- self.fail() |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
16 |
- except expat.ExpatError as e: |
|
9f5266ce04c7
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') |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
|
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
class ErrorMessageTest(unittest.TestCase): |
|
9f5266ce04c7
24311913 python expat test fails after libexpat upgrade
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
def test_codes(self): |