156 lines
6.3 KiB
Diff
156 lines
6.3 KiB
Diff
From 7da97f61816f3cadaa6788804b22a2434b40e8c5 Mon Sep 17 00:00:00 2001
|
||
From: "Miss Islington (bot)"
|
||
<31488909+miss-islington@users.noreply.github.com>
|
||
Date: Mon, 21 Feb 2022 08:16:09 -0800
|
||
Subject: [PATCH] bpo-46811: Make test suite support Expat >=2.4.5 (GH-31453)
|
||
(GH-31472)
|
||
|
||
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 | 23 +---
|
||
Lib/test/test_xml_etree.py | 50 +++++-----
|
||
Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst | 2
|
||
3 files changed, 39 insertions(+), 36 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,7 +6,6 @@ import io
|
||
from test import support
|
||
import unittest
|
||
|
||
-import pyexpat
|
||
import xml.dom.minidom
|
||
|
||
from xml.dom.minidom import parse, Attr, Node, Document, parseString
|
||
@@ -1163,13 +1162,11 @@ 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,
|
||
- b'<fran\xe7ais></fran\xe7ais>')
|
||
- self.assertRaises(ExpatError, parseString,
|
||
- b'<franais>Comment \xe7a va ? Tr\xe8s bien ?</franais>')
|
||
- else:
|
||
- self.assertRaises(UnicodeDecodeError, parseString,
|
||
+ # It doesn’t make any sense to insist on the exact text of the
|
||
+ # error message, or even the exact Exception … it is enough that
|
||
+ # the error has been discovered.
|
||
+ with self.assertRaises((UnicodeDecodeError, ExpatError)):
|
||
+ parseString(
|
||
b'<fran\xe7ais>Comment \xe7a va ? Tr\xe8s bien ?</fran\xe7ais>')
|
||
|
||
doc.unlink()
|
||
@@ -1631,12 +1628,10 @@ 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')
|
||
- else:
|
||
- context = self.assertRaisesRegex(ValueError, 'Unsupported syntax')
|
||
-
|
||
- with context:
|
||
+ # It doesn’t make any sense to insist on the exact text of the
|
||
+ # error message, or even the exact Exception … it is enough that
|
||
+ # the error has been discovered.
|
||
+ with self.assertRaises((ExpatError, ValueError)):
|
||
parseString('<element xmlns:abc="http:abc.com/de f g/hi/j k"><abc:foo /></element>')
|
||
|
||
def testDocRemoveChild(self):
|
||
--- a/Lib/test/test_xml_etree.py
|
||
+++ b/Lib/test/test_xml_etree.py
|
||
@@ -13,6 +13,7 @@ import itertools
|
||
import operator
|
||
import os
|
||
import pickle
|
||
+import pyexpat
|
||
import sys
|
||
import textwrap
|
||
import types
|
||
@@ -120,6 +121,10 @@ ATTLIST_XML = """\
|
||
</foo>
|
||
"""
|
||
|
||
+fails_with_expat_2_6_0 = (unittest.expectedFailure
|
||
+ if pyexpat.version_info >= (2, 6, 0) else
|
||
+ lambda test: test)
|
||
+
|
||
def checkwarnings(*filters, quiet=False):
|
||
def decorator(test):
|
||
def newtest(*args, **kwargs):
|
||
@@ -1400,28 +1405,29 @@ class XMLPullParserTest(unittest.TestCas
|
||
self.assertEqual([(action, elem.tag) for action, elem in events],
|
||
expected)
|
||
|
||
- def test_simple_xml(self):
|
||
- for chunk_size in (None, 1, 5):
|
||
- with self.subTest(chunk_size=chunk_size):
|
||
- parser = ET.XMLPullParser()
|
||
- self.assert_event_tags(parser, [])
|
||
- self._feed(parser, "<!-- comment -->\n", chunk_size)
|
||
- self.assert_event_tags(parser, [])
|
||
- self._feed(parser,
|
||
- "<root>\n <element key='value'>text</element",
|
||
- chunk_size)
|
||
- self.assert_event_tags(parser, [])
|
||
- self._feed(parser, ">\n", chunk_size)
|
||
- self.assert_event_tags(parser, [('end', 'element')])
|
||
- self._feed(parser, "<element>text</element>tail\n", chunk_size)
|
||
- self._feed(parser, "<empty-element/>\n", chunk_size)
|
||
- self.assert_event_tags(parser, [
|
||
- ('end', 'element'),
|
||
- ('end', 'empty-element'),
|
||
- ])
|
||
- self._feed(parser, "</root>\n", chunk_size)
|
||
- self.assert_event_tags(parser, [('end', 'root')])
|
||
- self.assertIsNone(parser.close())
|
||
+ def test_simple_xml(self, chunk_size=None):
|
||
+ parser = ET.XMLPullParser()
|
||
+ self.assert_event_tags(parser, [])
|
||
+ self._feed(parser, "<!-- comment -->\n", chunk_size)
|
||
+ self.assert_event_tags(parser, [])
|
||
+ self._feed(parser,
|
||
+ "<root>\n <element key='value'>text</element",
|
||
+ chunk_size)
|
||
+ self.assert_event_tags(parser, [])
|
||
+ self._feed(parser, ">\n", chunk_size)
|
||
+ self.assert_event_tags(parser, [('end', 'element')])
|
||
+ self._feed(parser, "<element>text</element>tail\n", chunk_size)
|
||
+ self._feed(parser, "<empty-element/>\n", chunk_size)
|
||
+ self.assert_event_tags(parser, [
|
||
+ ('end', 'element'),
|
||
+ ('end', 'empty-element'),
|
||
+ ])
|
||
+ self._feed(parser, "</root>\n", chunk_size)
|
||
+ self.assert_event_tags(parser, [('end', 'root')])
|
||
+ self.assertIsNone(parser.close())
|
||
+
|
||
+ def test_simple_xml_chunk_22(self):
|
||
+ self.test_simple_xml(chunk_size=22)
|
||
|
||
def test_feed_while_iterating(self):
|
||
parser = ET.XMLPullParser()
|
||
--- /dev/null
|
||
+++ b/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst
|
||
@@ -0,0 +1,2 @@
|
||
+Fix tests for :class:`~xml.etree.ElementTree.XMLPullParser` with Expat
|
||
+2.6.0.
|