From 46a04323e065be23404fd7fc82c18983302b3feebd0ee0c66f6abb85575b2e17 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Thu, 7 Mar 2024 08:17:31 +0000 Subject: [PATCH] - Drop gh115133-XMLPullParserTest-fail.patch upstreamed now. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python313?expand=0&rev=9 --- gh115133-XMLPullParserTest-fail.patch | 99 --------------------------- python313.changes | 5 ++ python313.spec | 3 - 3 files changed, 5 insertions(+), 102 deletions(-) delete mode 100644 gh115133-XMLPullParserTest-fail.patch diff --git a/gh115133-XMLPullParserTest-fail.patch b/gh115133-XMLPullParserTest-fail.patch deleted file mode 100644 index 5f038ea..0000000 --- a/gh115133-XMLPullParserTest-fail.patch +++ /dev/null @@ -1,99 +0,0 @@ -From e27eafb7bcf0a4482f46d2e136deebaa2812f7f9 Mon Sep 17 00:00:00 2001 -From: Serhiy Storchaka -Date: Thu, 8 Feb 2024 14:17:04 +0200 -Subject: [PATCH 1/2] gh-115133: Fix tests for XMLPullParser with Expat 2.6.0 - -Feeding the parser by too small chunks defers parsing to prevent -CVE-2023-52425. Future versions of Expat may be more reactive. ---- - Lib/test/test_xml_etree.py | 58 ++++++---- - Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst | 2 - 2 files changed, 38 insertions(+), 22 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst - ---- 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 = """\ - - """ - -+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): -@@ -1398,28 +1403,37 @@ 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, "\n", chunk_size) -- self.assert_event_tags(parser, []) -- self._feed(parser, -- "\n text\n", chunk_size) -- self.assert_event_tags(parser, [('end', 'element')]) -- self._feed(parser, "texttail\n", chunk_size) -- self._feed(parser, "\n", chunk_size) -- self.assert_event_tags(parser, [ -- ('end', 'element'), -- ('end', 'empty-element'), -- ]) -- self._feed(parser, "\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, "\n", chunk_size) -+ self.assert_event_tags(parser, []) -+ self._feed(parser, -+ "\n text\n", chunk_size) -+ self.assert_event_tags(parser, [('end', 'element')]) -+ self._feed(parser, "texttail\n", chunk_size) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, [ -+ ('end', 'element'), -+ ('end', 'empty-element'), -+ ]) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, [('end', 'root')]) -+ self.assertIsNone(parser.close()) -+ -+ @fails_with_expat_2_6_0 -+ def test_simple_xml_chunk_1(self): -+ self.test_simple_xml(chunk_size=1) -+ -+ @fails_with_expat_2_6_0 -+ def test_simple_xml_chunk_5(self): -+ self.test_simple_xml(chunk_size=5) -+ -+ 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. diff --git a/python313.changes b/python313.changes index b5640ca..5a1d458 100644 --- a/python313.changes +++ b/python313.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 7 08:16:28 UTC 2024 - Daniel Garcia + +- Drop gh115133-XMLPullParserTest-fail.patch upstreamed now. + ------------------------------------------------------------------- Wed Mar 6 14:13:58 UTC 2024 - Pedro Monreal diff --git a/python313.spec b/python313.spec index 97abe55..2e75882 100644 --- a/python313.spec +++ b/python313.spec @@ -163,9 +163,6 @@ Patch34: skip-test_pyobject_freed_is_freed.patch # PATCH-FIX-SLE fix_configure_rst.patch bpo#43774 mcepl@suse.com # remove duplicate link targets and make documentation with old Sphinx in SLE Patch35: fix_configure_rst.patch -# PATCH-FIX-UPSTREAM gh115133-XMLPullParserTest-fail.patch gh#python/cpython#115133 mcepl@suse.com -# Make Python work with the new libexpat -Patch36: gh115133-XMLPullParserTest-fail.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes