diff options
author | Trevor Gamblin <tgamblin@baylibre.com> | 2024-04-11 20:42:02 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-14 06:28:02 +0100 |
commit | 6cbe62a0cee10ecb05bcaddcfe0cd185a033d198 (patch) | |
tree | 08a1cfa16a5de1e4a6754f3c9a5b7fb52e60268b /meta/recipes-devtools | |
parent | 210a70c9815faedc8f55875a16afc90ed06d77e0 (diff) | |
download | poky-6cbe62a0cee10ecb05bcaddcfe0cd185a033d198.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch | 55 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.12.3.bb (renamed from meta/recipes-devtools/python/python3_3.12.2.bb) | 3 |
2 files changed, 1 insertions, 57 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch b/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch deleted file mode 100644 index 598ef08cc4..0000000000 --- a/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From d07ca7fbd874e230dec4d4c6d650a66ea2a9008e Mon Sep 17 00:00:00 2001 | ||
2 | From: Sebastian Pipping <sebastian@pipping.org> | ||
3 | Date: Wed, 7 Feb 2024 15:32:45 +0100 | ||
4 | Subject: [PATCH] test_xml_etree.py: Fix for Expat >=2.6.0 with reparse | ||
5 | deferral | ||
6 | |||
7 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/115138] | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Lib/test/test_xml_etree.py | 10 ++++++---- | ||
11 | .../2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | 1 + | ||
12 | 2 files changed, 7 insertions(+), 4 deletions(-) | ||
13 | create mode 100644 Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | ||
14 | |||
15 | diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py | ||
16 | index b50898f..4578367 100644 | ||
17 | --- a/Lib/test/test_xml_etree.py | ||
18 | +++ b/Lib/test/test_xml_etree.py | ||
19 | @@ -1403,6 +1403,7 @@ class XMLPullParserTest(unittest.TestCase): | ||
20 | def test_simple_xml(self): | ||
21 | for chunk_size in (None, 1, 5): | ||
22 | with self.subTest(chunk_size=chunk_size): | ||
23 | + expected_events = [] | ||
24 | parser = ET.XMLPullParser() | ||
25 | self.assert_event_tags(parser, []) | ||
26 | self._feed(parser, "<!-- comment -->\n", chunk_size) | ||
27 | @@ -1412,16 +1413,17 @@ class XMLPullParserTest(unittest.TestCase): | ||
28 | chunk_size) | ||
29 | self.assert_event_tags(parser, []) | ||
30 | self._feed(parser, ">\n", chunk_size) | ||
31 | - self.assert_event_tags(parser, [('end', 'element')]) | ||
32 | + expected_events += [('end', 'element')] | ||
33 | self._feed(parser, "<element>text</element>tail\n", chunk_size) | ||
34 | self._feed(parser, "<empty-element/>\n", chunk_size) | ||
35 | - self.assert_event_tags(parser, [ | ||
36 | + expected_events += [ | ||
37 | ('end', 'element'), | ||
38 | ('end', 'empty-element'), | ||
39 | - ]) | ||
40 | + ] | ||
41 | self._feed(parser, "</root>\n", chunk_size) | ||
42 | - self.assert_event_tags(parser, [('end', 'root')]) | ||
43 | + expected_events += [('end', 'root')] | ||
44 | self.assertIsNone(parser.close()) | ||
45 | + self.assert_event_tags(parser, expected_events) | ||
46 | |||
47 | def test_feed_while_iterating(self): | ||
48 | parser = ET.XMLPullParser() | ||
49 | 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 | ||
50 | new file mode 100644 | ||
51 | index 0000000..4dc9c13 | ||
52 | --- /dev/null | ||
53 | +++ b/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | ||
54 | @@ -0,0 +1 @@ | ||
55 | +Fix etree XMLPullParser tests for Expat >=2.6.0 with reparse deferral | ||
diff --git a/meta/recipes-devtools/python/python3_3.12.2.bb b/meta/recipes-devtools/python/python3_3.12.3.bb index f837f05af4..b49a58a101 100644 --- a/meta/recipes-devtools/python/python3_3.12.2.bb +++ b/meta/recipes-devtools/python/python3_3.12.3.bb | |||
@@ -30,14 +30,13 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
30 | file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ | 30 | file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ |
31 | file://0001-test_storlines-skip-due-to-load-variability.patch \ | 31 | file://0001-test_storlines-skip-due-to-load-variability.patch \ |
32 | file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ | 32 | file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ |
33 | file://0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch \ | ||
34 | " | 33 | " |
35 | 34 | ||
36 | SRC_URI:append:class-native = " \ | 35 | SRC_URI:append:class-native = " \ |
37 | file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ | 36 | file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ |
38 | " | 37 | " |
39 | 38 | ||
40 | SRC_URI[sha256sum] = "be28112dac813d2053545c14bf13a16401a21877f1a69eb6ea5d84c4a0f3d870" | 39 | SRC_URI[sha256sum] = "56bfef1fdfc1221ce6720e43a661e3eb41785dd914ce99698d8c7896af4bdaa1" |
41 | 40 | ||
42 | # exclude pre-releases for both python 2.x and 3.x | 41 | # exclude pre-releases for both python 2.x and 3.x |
43 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" | 42 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" |