- Remove old-libexpat.patch, of course.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python310?expand=0&rev=129
This commit is contained in:
parent
31dd9389f8
commit
1f90dc5291
@ -1,79 +0,0 @@
|
|||||||
---
|
|
||||||
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
|
|
||||||
@@ -1215,10 +1215,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()
|
|
||||||
@@ -1240,6 +1239,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)
|
|
||||||
@@ -1249,8 +1250,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
|
|
||||||
@@ -1623,11 +1623,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", ">"):
|
|
||||||
@@ -1648,17 +1646,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:
|
|
@ -4,6 +4,7 @@ Fri Apr 19 08:37:04 UTC 2024 - Matej Cepl <mcepl@suse.com>
|
|||||||
- Add CVE-2023-52425-libexpat-2.6.0-backport.patch to fix tests with
|
- Add CVE-2023-52425-libexpat-2.6.0-backport.patch to fix tests with
|
||||||
patched libexpat below 2.6.0 that doesn't update the version number,
|
patched libexpat below 2.6.0 that doesn't update the version number,
|
||||||
just in SLE.
|
just in SLE.
|
||||||
|
- Remove old-libexpat.patch, of course.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Mar 24 00:43:14 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
Sun Mar 24 00:43:14 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||||
|
Loading…
Reference in New Issue
Block a user