python3.12: update to version 3.12.10. (#12153)

Re-run the test suite on both bare-metal nightly 32 bits (hrev58812),
and beta5 64 bits under VMware, to double check which tests still hang
and which work.

Did my best to add some notes on possible causes for the failing ones.
This commit is contained in:
OscarL
2025-04-15 06:11:39 +00:00
committed by GitHub
parent 8d9e0240e9
commit 40045a4ffd
2 changed files with 142 additions and 114 deletions

View File

@@ -1,4 +1,4 @@
From ced60ec5539b7f2c9da08140ab83bcabc8acee1c Mon Sep 17 00:00:00 2001
From 22e4016e3b29e96a85a4360a1d5c96bd3da896c5 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 8 Oct 2023 01:02:25 -0300
Subject: initial Haiku patch
@@ -32,7 +32,7 @@ index 0000000..4372ee2
+set -v
+eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" $HEADERS/posix/netinet/in.h
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 689f33d..fb2195b 100644
index 7ca3dc6..6445567 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -147,7 +147,7 @@ BINDIR= @bindir@
@@ -239,20 +239,20 @@ index 1a02d19..63a3bd3 100644
esac
AC_MSG_CHECKING([for --with-libm=STRING])
--
2.45.2
2.48.1
From 5a4db8cc635464695177f95df45557fb08c8b8fe Mon Sep 17 00:00:00 2001
From 3ec2248a7728a37ce7b68bc909518d3143cce4b2 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 16 Apr 2017 10:05:42 +0200
Subject: fix for negative errnos
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 3ec39ca..6ae03cd 100644
index 881a9ce..7ca34b4 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1948,6 +1948,8 @@ class Popen:
@@ -1940,6 +1940,8 @@ class Popen:
SubprocessError)
if issubclass(child_exception_type, OSError) and hex_errno:
errno_num = int(hex_errno, 16)
@@ -277,10 +277,10 @@ index 35ea2ac..ccc25ed 100644
*--cur = Py_hexdigits[saved_errno % 16];
saved_errno /= 16;
--
2.45.2
2.48.1
From 110187fb1fa288006bd2f83a9bf55796fc582038 Mon Sep 17 00:00:00 2001
From 7edd0a9045ad11aa0fbfcebf1b2d57a2f0932608 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 8 Oct 2023 20:06:31 -0300
Subject: Implement CTypes's find_library for Haiku
@@ -374,10 +374,10 @@ index c550883..6b23423 100644
print(cdll.LoadLibrary("libm.so"))
print(cdll.LoadLibrary("libcrypt.so"))
--
2.45.2
2.48.1
From 3451f6920a611b5af13fefed644b05b708a82a0e Mon Sep 17 00:00:00 2001
From 2720e83e5b368dd0ca745e18e0ce27476862ba3d Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Mon, 23 Sep 2019 09:14:58 +0200
Subject: webbrowser: Support for default browsers on Haiku
@@ -401,10 +401,10 @@ index 13b9e85..7d81178 100755
# First try to use the default Windows browser
register("windows-default", WindowsDefault)
--
2.45.2
2.48.1
From c8f5fd71384b15cd2a88c824de4b8a809c349a28 Mon Sep 17 00:00:00 2001
From 0774906be0d6b3d4c13aaaa1d161183ac2c63ab4 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 4 Oct 2019 22:02:35 +0200
Subject: since 3.8, don't reinit locks on fork.
@@ -424,10 +424,10 @@ index 22d3198..f369a88 100644
pass # no-op when os.register_at_fork does not exist.
else:
--
2.45.2
2.48.1
From f47a1e3fd1963f75b48439573d0860a35bc8e80b Mon Sep 17 00:00:00 2001
From a2390a2228172893b31cad29d4719570d0994cc4 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 15 May 2020 15:20:57 +0200
Subject: handle errors returned by internal_connect()
@@ -435,10 +435,10 @@ Subject: handle errors returned by internal_connect()
upstream bug #40628 by Ryan C. Gordon
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 7f2ebba..47e56d1 100644
index 27afd73..4ceccd9 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -3492,7 +3492,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro)
@@ -3543,7 +3543,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro)
}
res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1);
@@ -447,7 +447,7 @@ index 7f2ebba..47e56d1 100644
return NULL;
Py_RETURN_NONE;
@@ -3523,7 +3523,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro)
@@ -3574,7 +3574,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro)
}
res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 0);
@@ -457,10 +457,10 @@ index 7f2ebba..47e56d1 100644
return PyLong_FromLong((long) res);
--
2.45.2
2.48.1
From b122dd23f732a49fa4fa1c5d1d088693933f1a97 Mon Sep 17 00:00:00 2001
From 322784606d6661cba4b52daa07127fdc69e81d0d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 Oct 2020 18:03:09 +0200
Subject: ttyname_r can use MAXPATHLEN
@@ -487,10 +487,10 @@ index c21c6f0..51421e1 100644
if (buffer == NULL) {
return PyErr_NoMemory();
--
2.45.2
2.48.1
From 2ea7ad4feb7d3a2bb940b102cf1bb457e6859a2d Mon Sep 17 00:00:00 2001
From 7e896bb4cbe95dc7eb01a13793c0e5d874dc48ab Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Mon, 24 Oct 2022 20:04:10 -0300
Subject: Lib/test: require the "largefile" usage flag for I/O heavy tests.
@@ -540,10 +540,10 @@ index 1867e8c..e4fab02 100644
'test requires %s bytes and a long time to run' % str(0x180000000))
f = open(TESTFN, 'w+b')
--
2.45.2
2.48.1
From d2240d3f6402cc0982184a306780c8345de084cb Mon Sep 17 00:00:00 2001
From bef6c38a8c21355ea240f4099616b6993757e2fc Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Fri, 26 Jul 2024 19:18:56 -0300
Subject: _getuserbase(), getsitepackages(), and INSTALL_SCHEMES for Haiku.
@@ -622,7 +622,7 @@ index aed254a..d3612a0 100644
if sys.platlibdir != "lib":
libdirs.append("lib")
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 7dd63b9..e608b5e 100644
index acc8d4d..56efaaf 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -47,6 +47,36 @@ _INSTALL_SCHEMES = {
@@ -719,7 +719,7 @@ index 7dd63b9..e608b5e 100644
'osx_framework_user': {
'stdlib': '{userbase}/lib/python',
'platstdlib': '{userbase}/lib/python',
@@ -280,6 +339,18 @@ def _expand_vars(scheme, vars):
@@ -287,6 +346,18 @@ def _expand_vars(scheme, vars):
def _get_preferred_schemes():
@@ -739,7 +739,7 @@ index 7dd63b9..e608b5e 100644
return {
'prefix': 'nt',
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 3468d0c..35bea57 100644
index 67647e1..078a260 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -353,9 +353,10 @@ class TestSysConfig(unittest.TestCase):
@@ -756,10 +756,10 @@ index 3468d0c..35bea57 100644
@skip_unless_symlink
--
2.45.2
2.48.1
From 5e9a20c305c91090979f5d1bfe5a0717e163ca75 Mon Sep 17 00:00:00 2001
From 1a148d78e0ae2cc8cb8fffe237b1799a7ff359bf Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Fri, 26 Jul 2024 19:01:05 -0300
Subject: Fix location of REPL's history file.
@@ -793,10 +793,10 @@ index d3612a0..3a714a0 100644
readline.read_history_file(history)
except OSError:
--
2.45.2
2.48.1
From 2ab0f0054255bf3b7060184e4cecba14ac6448d3 Mon Sep 17 00:00:00 2001
From 29005f55483b312ab906ba6c1469cc43485e6811 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 8 Oct 2023 17:02:19 -0300
Subject: Use spawn instead of fork for multiprocessing.
@@ -846,10 +846,10 @@ index de8a264..02a301e 100644
# on macOS since macOS 10.14 (Mojave). Use spawn by default instead.
_default_context = DefaultContext(_concrete_contexts['spawn'])
--
2.45.2
2.48.1
From 206c6c3cc6371c5f526ea29e5fdccfdb7ef282c8 Mon Sep 17 00:00:00 2001
From ce5827744a01456e6ddddeb549233e93f64ca34a Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 10 Dec 2023 19:50:22 -0300
Subject: Miscellaneous "Lib/test/" fixes for Haiku.
@@ -860,10 +860,10 @@ Content-Transfer-Encoding: 8bit
test_fileio.py fix from "initial Haiku patch" by Jérôme Duval.
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index 903a43a..287624f 100644
index b2d5750..c04a185 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -5973,6 +5973,9 @@ def pairs(iterable):
@@ -6020,6 +6020,9 @@ def pairs(iterable):
class ZoneInfo(tzinfo):
zoneroot = '/usr/share/zoneinfo'
@@ -886,10 +886,10 @@ index ebfcffd..0517b87 100644
# Somehow /dev/tty appears seekable on some BSDs
self.assertEqual(f.seekable(), False)
--
2.45.2
2.48.1
From d16a22d00038e54c32a4358a7febfca32ba93528 Mon Sep 17 00:00:00 2001
From b6438893be1f0ea1ac6b7296cb6854abc3179296 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sat, 10 Feb 2024 06:01:25 -0300
Subject: Fix build on nightlies, following the addition of kqueue.
@@ -952,10 +952,10 @@ index 50788e5..82fd9d9 100644
/* NETDEV filter flags */
--
2.45.2
2.48.1
From e188d6f612aa90014e3eb4dc2591797b694f3775 Mon Sep 17 00:00:00 2001
From cd75d6fe66da5fb1109934a27490839dbcb07a14 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Thu, 14 Mar 2024 12:54:33 -0500
Subject: config.guess: Update to universal haiku arch guessing
@@ -982,10 +982,10 @@ index e81d3ae..366429c 100755
SX-4:SUPER-UX:*:*)
GUESS=sx4-nec-superux$UNAME_RELEASE
--
2.45.2
2.48.1
From 62187db712b992fd67fefd1bfe5a4ee974f26af6 Mon Sep 17 00:00:00 2001
From a19d0ace5469dc481adc9910b1953ac2fa574bbb Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Fri, 9 Aug 2024 13:38:28 -0300
Subject: fix test_utf8_mode.
@@ -1005,10 +1005,10 @@ index f668810..a55a8e4 100644
elif sys.platform.startswith("aix"):
c_arg = arg.decode('iso-8859-1')
--
2.45.2
2.48.1
From 1aaae4cbef0f3e832506d71be41b06164a440dd3 Mon Sep 17 00:00:00 2001
From b2349eb308cb3969e37d449f9b7cd7d149ad0e2b Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Fri, 9 Aug 2024 14:35:04 -0300
Subject: Fix test_site.
@@ -1061,7 +1061,7 @@ index 3a714a0..2124aa1 100644
"vendor-packages"))
elif os.sep == '/':
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 1a9c81d..09e612f 100644
index 249e6b5..a575423 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -322,7 +322,21 @@ class HelperFunctionsTests(unittest.TestCase):
@@ -1088,17 +1088,17 @@ index 1a9c81d..09e612f 100644
if sys.platlibdir != "lib":
self.assertEqual(len(dirs), 2)
--
2.45.2
2.48.1
From 08a6fc4f113001e8601ef50eed14b9a3fd9b2f5d Mon Sep 17 00:00:00 2001
From 4b18beee770bb7dbee777641ef9cb092b8f9bc37 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Fri, 9 Aug 2024 15:37:13 -0300
Subject: Fix test_sysconfig.
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 35bea57..04c136f 100644
index 078a260..6175b08 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -210,6 +210,19 @@ class TestSysConfig(unittest.TestCase):
@@ -1131,10 +1131,10 @@ index 35bea57..04c136f 100644
wanted.extend(['nt_user', 'osx_framework_user', 'posix_user', 'haiku_user'])
self.assertEqual(get_scheme_names(), tuple(sorted(wanted)))
--
2.45.2
2.48.1
From b9c25f918355e58eceb0a92e506ea86ce355cce5 Mon Sep 17 00:00:00 2001
From ec939e784caadd02233ce26a469f11bc0ce3ae95 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Fri, 9 Aug 2024 15:45:45 -0300
Subject: Fix test_compileall by skipping tests that need hardlink support.
@@ -1164,5 +1164,5 @@ index 5832f84..2e736db 100644
# Test hardlink_dupes parameter of compileall.compile_dir()
--
2.45.2
2.48.1