mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
python3: upgrade 3.12.2 -> 3.12.3
Remove the following patch: 0001-gh-115133-Fix-tests-for-XMLPullParser-with-Expat-2.6.patch Which a different fix was submitted for in: c4fa79b924 [3.12] gh-115133: Fix tests for XMLPullParser with Expat 2.6.0 (GH-115164) (GH-115288) See: https://github.com/python/cpython/pull/115288 (related to CVE-2023-52425) Changelog: https://docs.python.org/3/whatsnew/changelog.html#python-3-12-3-final (From OE-Core rev: 4122d8f6ecf6957de7a34fc51beffcd8e808911f) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
210a70c981
commit
6cbe62a0ce
-55
@@ -1,55 +0,0 @@
|
|||||||
From d07ca7fbd874e230dec4d4c6d650a66ea2a9008e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sebastian Pipping <sebastian@pipping.org>
|
|
||||||
Date: Wed, 7 Feb 2024 15:32:45 +0100
|
|
||||||
Subject: [PATCH] test_xml_etree.py: Fix for Expat >=2.6.0 with reparse
|
|
||||||
deferral
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/python/cpython/pull/115138]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
Lib/test/test_xml_etree.py | 10 ++++++----
|
|
||||||
.../2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | 1 +
|
|
||||||
2 files changed, 7 insertions(+), 4 deletions(-)
|
|
||||||
create mode 100644 Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst
|
|
||||||
|
|
||||||
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
|
|
||||||
index b50898f..4578367 100644
|
|
||||||
--- a/Lib/test/test_xml_etree.py
|
|
||||||
+++ b/Lib/test/test_xml_etree.py
|
|
||||||
@@ -1403,6 +1403,7 @@ class XMLPullParserTest(unittest.TestCase):
|
|
||||||
def test_simple_xml(self):
|
|
||||||
for chunk_size in (None, 1, 5):
|
|
||||||
with self.subTest(chunk_size=chunk_size):
|
|
||||||
+ expected_events = []
|
|
||||||
parser = ET.XMLPullParser()
|
|
||||||
self.assert_event_tags(parser, [])
|
|
||||||
self._feed(parser, "<!-- comment -->\n", chunk_size)
|
|
||||||
@@ -1412,16 +1413,17 @@ class XMLPullParserTest(unittest.TestCase):
|
|
||||||
chunk_size)
|
|
||||||
self.assert_event_tags(parser, [])
|
|
||||||
self._feed(parser, ">\n", chunk_size)
|
|
||||||
- self.assert_event_tags(parser, [('end', 'element')])
|
|
||||||
+ expected_events += [('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, [
|
|
||||||
+ expected_events += [
|
|
||||||
('end', 'element'),
|
|
||||||
('end', 'empty-element'),
|
|
||||||
- ])
|
|
||||||
+ ]
|
|
||||||
self._feed(parser, "</root>\n", chunk_size)
|
|
||||||
- self.assert_event_tags(parser, [('end', 'root')])
|
|
||||||
+ expected_events += [('end', 'root')]
|
|
||||||
self.assertIsNone(parser.close())
|
|
||||||
+ self.assert_event_tags(parser, expected_events)
|
|
||||||
|
|
||||||
def test_feed_while_iterating(self):
|
|
||||||
parser = ET.XMLPullParser()
|
|
||||||
diff --git a/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst b/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..4dc9c13
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+Fix etree XMLPullParser tests for Expat >=2.6.0 with reparse deferral
|
|
||||||
+1
-2
@@ -30,14 +30,13 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
|
|||||||
file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \
|
file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \
|
||||||
file://0001-test_storlines-skip-due-to-load-variability.patch \
|
file://0001-test_storlines-skip-due-to-load-variability.patch \
|
||||||
file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \
|
file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \
|
||||||
file://0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI:append:class-native = " \
|
SRC_URI:append:class-native = " \
|
||||||
file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \
|
file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "be28112dac813d2053545c14bf13a16401a21877f1a69eb6ea5d84c4a0f3d870"
|
SRC_URI[sha256sum] = "56bfef1fdfc1221ce6720e43a661e3eb41785dd914ce99698d8c7896af4bdaa1"
|
||||||
|
|
||||||
# exclude pre-releases for both python 2.x and 3.x
|
# exclude pre-releases for both python 2.x and 3.x
|
||||||
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
|
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
|
||||||
Reference in New Issue
Block a user