Matej Cepl
9c0a8f3c4c
* Support Expat >= 2.4.4 (jsc#SLE-21253) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python311?expand=0&rev=14
76 lines
3.0 KiB
Diff
76 lines
3.0 KiB
Diff
From d4f5bb912e67299b59b814b89a5afd9a8821a14e Mon Sep 17 00:00:00 2001
|
|
From: "Miss Islington (bot)"
|
|
<31488909+miss-islington@users.noreply.github.com>
|
|
Date: Mon, 21 Feb 2022 11:03:08 -0800
|
|
Subject: [PATCH] bpo-46811: Make test suite support Expat >=2.4.5 (GH-31453)
|
|
(GH-31471)
|
|
|
|
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
|
|
(cherry picked from commit 2cae93832f46b245847bdc252456ddf7742ef45e)
|
|
|
|
Co-authored-by: Sebastian Pipping <sebastian@pipping.org>
|
|
---
|
|
Lib/test/test_minidom.py | 13 ++++------
|
|
Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst | 1
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
create mode 100644 Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst
|
|
|
|
--- a/Lib/test/test_minidom.py
|
|
+++ b/Lib/test/test_minidom.py
|
|
@@ -6,12 +6,11 @@ import io
|
|
from test import support
|
|
import unittest
|
|
|
|
-import pyexpat
|
|
+import xml.parsers.expat
|
|
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")
|
|
@@ -1149,10 +1148,10 @@ class MinidomTest(unittest.TestCase):
|
|
|
|
# Verify that character decoding errors raise exceptions instead
|
|
# of crashing
|
|
- if pyexpat.version_info >= (2, 4, 5):
|
|
- self.assertRaises(ExpatError, parseString,
|
|
+ if xml.parsers.expat.version_info >= (2, 4, 4):
|
|
+ self.assertRaises(xml.parsers.expat.ExpatError, parseString,
|
|
b'<fran\xe7ais></fran\xe7ais>')
|
|
- self.assertRaises(ExpatError, parseString,
|
|
+ self.assertRaises(xml.parsers.expat.ExpatError, parseString,
|
|
b'<franais>Comment \xe7a va ? Tr\xe8s bien ?</franais>')
|
|
else:
|
|
self.assertRaises(UnicodeDecodeError, parseString,
|
|
@@ -1617,8 +1616,8 @@ class MinidomTest(unittest.TestCase):
|
|
self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE)
|
|
|
|
def testExceptionOnSpacesInXMLNSValue(self):
|
|
- if pyexpat.version_info >= (2, 4, 5):
|
|
- context = self.assertRaisesRegex(ExpatError, 'syntax error')
|
|
+ if xml.parsers.expat.version_info >= (2, 4, 4):
|
|
+ context = self.assertRaisesRegex(xml.parsers.expat.ExpatError, 'syntax error')
|
|
else:
|
|
context = self.assertRaisesRegex(ValueError, 'Unsupported syntax')
|
|
|
|
--- /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
|