Skip to content

Commit

Permalink
Revert "main/python: update to 3.12.3"
Browse files Browse the repository at this point in the history
This reverts commit 0b813b6.
  • Loading branch information
nekopsykose committed Apr 10, 2024
1 parent 0dbb83c commit eaa980e
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 3 deletions.
48 changes: 48 additions & 0 deletions main/python/patches/expat-2.6.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
Patch-Source: https://github.com/python/cpython/pull/115138
--
From a147a3e2b9252e8452a37628e07ddcd4e0709880 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

---
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 a435ec7822ea0c..1eac7dd08b9676 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1483,6 +1483,7 @@ def assert_event_tags(self, parser, expected, max_events=None):
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)
@@ -1492,16 +1493,17 @@ def test_simple_xml(self):
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()
7 changes: 4 additions & 3 deletions main/python/template.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# update pyver in autosplit logic and pre_pkg hook on major bumps
pkgname = "python"
_majver = "3.12"
pkgver = f"{_majver}.3"
pkgrel = 0
# .3 segfaults in ppc64le tests
pkgver = f"{_majver}.2"
pkgrel = 2
build_style = "gnu_configure"
configure_args = [
"--enable-shared",
Expand Down Expand Up @@ -58,7 +59,7 @@
license = "Python-2.0"
url = "https://python.org"
source = f"https://python.org/ftp/python/{pkgver}/Python-{pkgver}.tar.xz"
sha256 = "56bfef1fdfc1221ce6720e43a661e3eb41785dd914ce99698d8c7896af4bdaa1"
sha256 = "be28112dac813d2053545c14bf13a16401a21877f1a69eb6ea5d84c4a0f3d870"
# FIXME int cfi; cfi ftbfs, int fails ctypes test
# we cannot enable ubsan stuff because there is known UB where tests
# are just skipped and so on, so be on the safe side for the time being
Expand Down

0 comments on commit eaa980e

Please sign in to comment.