forked from pool/python38
Matej Cepl
68ee175f5e
libexpat < 2.6.0 (gh#python/cpython#117187). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python38?expand=0&rev=152
80 lines
3.3 KiB
Diff
80 lines
3.3 KiB
Diff
---
|
|
Lib/test/test_sax.py | 10 +++++-----
|
|
Lib/test/test_xml_etree.py | 17 ++++++++---------
|
|
2 files changed, 13 insertions(+), 14 deletions(-)
|
|
|
|
--- a/Lib/test/test_sax.py
|
|
+++ b/Lib/test/test_sax.py
|
|
@@ -1207,10 +1207,9 @@ class ExpatReaderTest(XmlTestBase):
|
|
|
|
self.assertEqual(result.getvalue(), start + b"<doc>text</doc>")
|
|
|
|
+ @unittest.skipIf(pyexpat.version_info < (2, 6, 0),
|
|
+ "Reparse deferral not defined for libexpat < 2.6.0")
|
|
def test_flush_reparse_deferral_enabled(self):
|
|
- if pyexpat.version_info < (2, 6, 0):
|
|
- self.skipTest(f'Expat {pyexpat.version_info} does not support reparse deferral')
|
|
-
|
|
result = BytesIO()
|
|
xmlgen = XMLGenerator(result)
|
|
parser = create_parser()
|
|
@@ -1232,6 +1231,8 @@ class ExpatReaderTest(XmlTestBase):
|
|
|
|
self.assertEqual(result.getvalue(), start + b"<doc></doc>")
|
|
|
|
+ @unittest.skipIf(pyexpat.version_info < (2, 6, 0),
|
|
+ "Reparse deferral not defined for libexpat < 2.6.0")
|
|
def test_flush_reparse_deferral_disabled(self):
|
|
result = BytesIO()
|
|
xmlgen = XMLGenerator(result)
|
|
@@ -1241,8 +1242,7 @@ class ExpatReaderTest(XmlTestBase):
|
|
for chunk in ("<doc", ">"):
|
|
parser.feed(chunk)
|
|
|
|
- if pyexpat.version_info >= (2, 6, 0):
|
|
- parser._parser.SetReparseDeferralEnabled(False)
|
|
+ parser._parser.SetReparseDeferralEnabled(False)
|
|
|
|
self.assertEqual(result.getvalue(), start) # i.e. no elements started
|
|
self.assertFalse(parser._parser.GetReparseDeferralEnabled())
|
|
--- a/Lib/test/test_xml_etree.py
|
|
+++ b/Lib/test/test_xml_etree.py
|
|
@@ -1494,11 +1494,9 @@ class XMLPullParserTest(unittest.TestCas
|
|
with self.assertRaises(ValueError):
|
|
ET.XMLPullParser(events=('start', 'end', 'bogus'))
|
|
|
|
+ @unittest.skipIf(pyexpat.version_info < (2, 6, 0),
|
|
+ "Reparse deferral not defined for libexpat < 2.6.0")
|
|
def test_flush_reparse_deferral_enabled(self):
|
|
- if pyexpat.version_info < (2, 6, 0):
|
|
- self.skipTest(f'Expat {pyexpat.version_info} does not '
|
|
- 'support reparse deferral')
|
|
-
|
|
parser = ET.XMLPullParser(events=('start', 'end'))
|
|
|
|
for chunk in ("<doc", ">"):
|
|
@@ -1519,17 +1517,18 @@ class XMLPullParserTest(unittest.TestCas
|
|
|
|
self.assert_event_tags(parser, [('end', 'doc')])
|
|
|
|
+ @unittest.skipIf(pyexpat.version_info < (2, 6, 0),
|
|
+ "Reparse deferral not defined for libexpat < 2.6.0")
|
|
def test_flush_reparse_deferral_disabled(self):
|
|
parser = ET.XMLPullParser(events=('start', 'end'))
|
|
|
|
for chunk in ("<doc", ">"):
|
|
parser.feed(chunk)
|
|
|
|
- if pyexpat.version_info >= (2, 6, 0):
|
|
- if not ET is pyET:
|
|
- self.skipTest(f'XMLParser.(Get|Set)ReparseDeferralEnabled '
|
|
- 'methods not available in C')
|
|
- parser._parser._parser.SetReparseDeferralEnabled(False)
|
|
+ if not ET is pyET:
|
|
+ self.skipTest(f'XMLParser.(Get|Set)ReparseDeferralEnabled '
|
|
+ 'methods not available in C')
|
|
+ parser._parser._parser.SetReparseDeferralEnabled(False)
|
|
|
|
self.assert_event_tags(parser, []) # i.e. no elements started
|
|
if ET is pyET:
|