diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2022-02-21 15:48:32 +0100 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2022-03-05 12:21:42 +0100 |
| commit | a73d4699a1d261f8d8a6df79fedf5c60301771cd (patch) | |
| tree | 3a3d2d1a4083674fae77ce9b2417c7b4932120d8 | |
| parent | bpo-45433: Do not link libpython against libcrypt (diff) | |
| download | cpython-a73d4699a1d261f8d8a6df79fedf5c60301771cd.tar.gz cpython-a73d4699a1d261f8d8a6df79fedf5c60301771cd.tar.bz2 cpython-a73d4699a1d261f8d8a6df79fedf5c60301771cd.zip | |
bpo-46811: Make test suite support Expat >=2.4.5 (GH-31453)gentoo-3.7.12_p2
Curly brackets were never allowed in namespace URIs
according to RFC 3986, and so-called namespace-validating
XML parsers have the right to reject them a invalid URIs.
libexpat >=2.4.5 has become strcter in that regard due to
related security issues; with ET.XML instantiating a
namespace-aware parser under the hood, this test has no
future in CPython.
References:
- https://datatracker.ietf.org/doc/html/rfc3968
- https://www.w3.org/TR/xml-names/
Also, test_minidom.py: Support Expat >=2.4.5
| -rw-r--r-- | Lib/test/test_minidom.py | 17 | ||||
| -rw-r--r-- | Lib/test/test_xml_etree.py | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py index 041a4151131..0b76f6e87bc 100644 --- a/Lib/test/test_minidom.py +++ b/Lib/test/test_minidom.py @@ -5,10 +5,12 @@ import pickle from test import support import unittest +import pyexpat import xml.dom.minidom from xml.dom.minidom import parse, Node, Document, parseString from xml.dom.minidom import getDOMImplementation +from xml.parsers.expat import ExpatError tstfile = support.findfile("test.xml", subdir="xmltestdata") @@ -1146,7 +1148,13 @@ class MinidomTest(unittest.TestCase): # Verify that character decoding errors raise exceptions instead # of crashing - self.assertRaises(UnicodeDecodeError, parseString, + if pyexpat.version_info >= (2, 4, 5): + self.assertRaises(ExpatError, parseString, + b'<fran\xe7ais></fran\xe7ais>') + self.assertRaises(ExpatError, parseString, + b'<franais>Comment \xe7a va ? Tr\xe8s bien ?</franais>') + else: + self.assertRaises(UnicodeDecodeError, parseString, b'<fran\xe7ais>Comment \xe7a va ? Tr\xe8s bien ?</fran\xe7ais>') doc.unlink() @@ -1592,7 +1600,12 @@ class MinidomTest(unittest.TestCase): self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE) def testExceptionOnSpacesInXMLNSValue(self): - with self.assertRaisesRegex(ValueError, 'Unsupported syntax'): + if pyexpat.version_info >= (2, 4, 5): + context = self.assertRaisesRegex(ExpatError, 'syntax error') + else: + context = self.assertRaisesRegex(ValueError, 'Unsupported syntax') + + with context: parseString('<element xmlns:abc="http:abc.com/de f g/hi/j k"><abc:foo /></element>') def testDocRemoveChild(self): diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 75c9c25a8b6..5ba0de82cdf 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -1683,12 +1683,6 @@ class BugsTest(unittest.TestCase): b"<?xml version='1.0' encoding='ascii'?>\n" b'<body>tãg</body>') - def test_issue3151(self): - e = ET.XML('<prefix:localname xmlns:prefix="${stuff}"/>') - self.assertEqual(e.tag, '{${stuff}}localname') - t = ET.ElementTree(e) - self.assertEqual(ET.tostring(e), b'<ns0:localname xmlns:ns0="${stuff}" />') - def test_issue6565(self): elem = ET.XML("<body><tag/></body>") self.assertEqual(summarize_list(elem), ['tag']) |