summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-devtools/python/python3
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2024-04-17 00:28:03 +0300
committerPatrick Williams <patrick@stwcx.xyz>2024-04-17 00:35:03 +0300
commit2f814a6d8285b35e9fb74e3ce9ce1c44b7e4f763 (patch)
treedd79e93858470af04df47c0953528bf612e8ffcb /poky/meta/recipes-devtools/python/python3
parentf0053a50e6a423e12b68673c89b53938346a3af6 (diff)
downloadopenbmc-2f814a6d8285b35e9fb74e3ce9ce1c44b7e4f763.tar.xz
poky: reset subtree on master HEAD(a88251b3e7)
As part of the last subtree update, I used master-next as the subtree basis because there was a fix we needed in order to get QEMU to pass. I didn't realize that master-next deviated (because they use to just have short-term patches in it). Reset the content to the same fix but from the master branch. Change-Id: Ic7d2f0ac42e9da3eb263586b26ba56d8798d5bcf Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'poky/meta/recipes-devtools/python/python3')
-rw-r--r--poky/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/poky/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch b/poky/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/poky/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 @@
-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