diff options
| author | Zach van Rijn <me@zv.io> | 2022-05-04 07:37:42 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-05-06 12:37:31 -0500 |
| commit | 348ed8e605c551c814c6a77ca4f6d77c24ce76f1 (patch) | |
| tree | e8da0c7527099ad6dc9a84e1bc146b7c46dcb6f7 /system/python3/fix-python-tests-expat-ge245.patch | |
| parent | 4c8de9c950f5e85113062a20a35d50e6b6adabb4 (diff) | |
| download | packages-348ed8e605c551c814c6a77ca4f6d77c24ce76f1.tar.gz packages-348ed8e605c551c814c6a77ca4f6d77c24ce76f1.tar.bz2 packages-348ed8e605c551c814c6a77ca4f6d77c24ce76f1.tar.xz packages-348ed8e605c551c814c6a77ca4f6d77c24ce76f1.zip | |
system/python3: bump { 3.10.2 --> 3.10.4 }. fixes #658.
Diffstat (limited to 'system/python3/fix-python-tests-expat-ge245.patch')
| -rw-r--r-- | system/python3/fix-python-tests-expat-ge245.patch | 112 |
1 files changed, 0 insertions, 112 deletions
diff --git a/system/python3/fix-python-tests-expat-ge245.patch b/system/python3/fix-python-tests-expat-ge245.patch deleted file mode 100644 index f95b648a1..000000000 --- a/system/python3/fix-python-tests-expat-ge245.patch +++ /dev/null @@ -1,112 +0,0 @@ -From dd7da01325ca32796e139507a38da08886f8f972 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 20 Feb 2022 20:39:07 +0100 -Subject: [PATCH 1/3] test_xml_etree.py: Drop mistaken test_issue3151 - -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/ ---- - Lib/test/test_xml_etree.py | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py -index a25f536134c7b..c5292b5e9ef68 100644 ---- a/Lib/test/test_xml_etree.py -+++ b/Lib/test/test_xml_etree.py -@@ -2192,12 +2192,6 @@ def test_issue6233(self): - 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']) - -From aa7523fef6e3759d02a02fa484acfebf9d0bd852 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 20 Feb 2022 20:56:38 +0100 -Subject: [PATCH 2/3] test_minidom.py: Support Expat >=2.4.5 - ---- - Lib/test/test_minidom.py | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py -index 1663b1f1143dd..97620258d82f6 100644 ---- a/Lib/test/test_minidom.py -+++ b/Lib/test/test_minidom.py -@@ -6,10 +6,12 @@ - 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") -@@ -1147,7 +1149,13 @@ def testEncodings(self): - - # 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() -@@ -1609,7 +1617,12 @@ def testEmptyXMLNSValue(self): - 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): - -From 2dcb3051b243fff2f031c14eea50a649e8b7c7ea Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 20 Feb 2022 21:03:40 +0100 -Subject: [PATCH 3/3] Add blurp file for bpo-46811 to section "Library" - ---- - .../NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst - -diff --git a/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst -new file mode 100644 -index 0000000000000..6969bd1898f65 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst -@@ -0,0 +1 @@ -+Make test suite support Expat >=2.4.5 |