Mailman 3 June 2026 - Python-checkins

gh-152680: Detect container/VM in test.pythoninfo (#152668)
by vstinner June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/f1c536372199cfb9c2e7b360b7bf04208c… commit: f1c536372199cfb9c2e7b360b7bf04208c9eee82 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2026-06-30T15:11:57Z summary: gh-152680: Detect container/VM in test.pythoninfo (#152668) On Apple, log the hardware model as "system.hardware". * Log the "CI", "IMAGE_OS_VERSION" and "container" environment variables. * Add run_command() and first_line() functions. files: M Lib/test/pythoninfo.py diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py index a2767f3975bed2..d7fd98a8d4311d 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -9,6 +9,9 @@ MS_WINDOWS = (sys.platform == "win32") +APPLE = (sys.platform in ("darwin", "ios", "tvos", "watchos")) + +COMMAND_TIMEOUT = 60.0 def normalize_text(text): @@ -19,6 +22,16 @@ def normalize_text(text): return text.strip() +def first_line(text): + # Get the first line. Return text unchanged if it's empty. + lines = text.splitlines() + if lines: + return lines[0] + else: + # text is an empty string + return text + + def read_first_line(filename): # Get the first line of a text file and strip trailing spaces try: @@ -293,9 +306,11 @@ def format_groups(groups): "BUILDPYTHON", "CC", "CFLAGS", + "CI", "COLUMNS", "COMPUTERNAME", "COMSPEC", + "CONTAINER", "CPP", "CPPFLAGS", "DISPLAY", @@ -310,6 +325,7 @@ def format_groups(groups): "HOMEDRIVE", "HOMEPATH", "IDLESTARTUP", + "IMAGE_OS_VERSION", "IPHONEOS_DEPLOYMENT_TARGET", "LANG", "LDFLAGS", @@ -434,24 +450,47 @@ def format_attr(attr, value): info_add('readline.library', 'GNU readline') -def collect_gdb(info_add): +def run_command(cmd, check=True, **kwargs): import subprocess + timeout = COMMAND_TIMEOUT + cmd_str = ' '.join(cmd) try: - proc = subprocess.Popen(["gdb", "-nx", "--version"], + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - universal_newlines=True) - version = proc.communicate()[0] - if proc.returncode: - # ignore gdb failure: test_gdb will log the error - return - except OSError: - return + stderr=subprocess.DEVNULL, + text=True, + **kwargs) + with proc: + try: + stdout = proc.communicate(timeout=timeout)[0] + except: + proc.kill() + proc.communicate() + raise - # Only keep the first line - version = version.splitlines()[0] - info_add('gdb_version', version) + if check and proc.returncode: + print(f"Command {cmd_str} failed with exit code {proc.returncode}") + return '' + + # Strip trailing spaces and newlines + stdout = stdout.rstrip() + return stdout + except FileNotFoundError: + return '' + except OSError as exc: + print(f"Command {cmd_str} failed with: {exc!r}") + return '' + except subprocess.TimeoutExpired: + print(f"Command {cmd_str}: timeout!") + return '' + + +def collect_gdb(info_add): + version = run_command(["gdb", "-nx", "--version"]) + if version: + # Only keep the first line + info_add('gdb_version', first_line(version)) def collect_tkinter(info_add): @@ -847,7 +886,6 @@ def collect_support_threading_helper(info_add): def collect_cc(info_add): - import subprocess import sysconfig CC = sysconfig.get_config_var('CC') @@ -860,23 +898,17 @@ def collect_cc(info_add): except ImportError: args = CC.split() args.append('--version') - try: - proc = subprocess.Popen(args, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - universal_newlines=True) - except OSError: + + stdout = run_command(args) + if not stdout: # Cannot run the compiler, for example when Python has been # cross-compiled and installed on the target platform where the # compiler is missing. - return - - stdout = proc.communicate()[0] - if proc.returncode: + # # CC --version failed: ignore error return - text = stdout.splitlines()[0] + text = first_line(stdout) text = normalize_text(text) info_add('CC.version', text) @@ -978,21 +1010,11 @@ def collect_windows(info_add): call_func(info_add, 'windows.oem_code_page', _winapi, 'GetOEMCP') # windows.version_caption: "wmic os get Caption,Version /value" command - import subprocess - try: - # When wmic.exe output is redirected to a pipe, - # it uses the OEM code page - proc = subprocess.Popen(["wmic", "os", "get", "Caption,Version", "/value"], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - encoding="oem", - text=True) - output, stderr = proc.communicate() - if proc.returncode: - output = "" - except OSError: - pass - else: + output = run_command(["wmic", "os", "get", "Caption,Version", "/value"], + # When wmic.exe output is redirected to a pipe, + # it uses the OEM code page + encoding="oem") + if output: for line in output.splitlines(): line = line.strip() if line.startswith('Caption='): @@ -1005,23 +1027,11 @@ def collect_windows(info_add): info_add('windows.version', line) # windows.ver: "ver" command - try: - proc = subprocess.Popen(["ver"], shell=True, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - text=True) - output = proc.communicate()[0] - if proc.returncode == 0xc0000142: - return - if proc.returncode: - output = "" - except OSError: - return - else: - output = output.strip() - line = output.splitlines()[0] - if line: - info_add('windows.ver', line) + output = run_command(["ver"], shell=True) + # "ver" output starts with an empty line: remove it + output = output.strip() + if output: + info_add('windows.ver', first_line(output)) # windows.developer_mode: get AllowDevelopmentWithoutDevLicense registry value = winreg_query(r"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows" @@ -1132,7 +1142,45 @@ def get_machine_id(): return None -def collect_linux(info_add): +def detect_virt(): + # Run systemd-detect-virt command + virt = run_command(["systemd-detect-virt"], check=False) + if virt and virt != "none": + return virt + + # Check if the process in running in a container + import os.path + if os.path.exists('/.dockerenv'): + return 'docker' + if os.path.exists('/run/.containerenv'): + return 'podman' + + container = read_first_line('/run/systemd/container') + if container: + return container + + if APPLE: + hv_vmm_present = run_command(['sysctl', '-n', 'kern.hv_vmm_present']) + if hv_vmm_present == '1': + return 'run in a VM (kern.hv_vmm_present is 1)' + + # Other ways to check if running in a container: + # * Parse /proc/1/mounts or /proc/1/mountinfo (check "/" filesystem). + # * Parse /proc/1/cgroup. + # * Parse the first line of /proc/1/sched (check process name is different + # than "init" and "systemd"). + # * Check / inode. + # * On systems using SELinux (Fedora/CentOS/RHEL), check for "container_t" + # label, for example of /proc/1/attr/current. + # * Check for "container" variable in /proc/1/environ + # (only root can read this file). + # * Check for "container" environment variable. + # * Set a specific env var when creating the container image. + # * Run virt-what, need to install the script, and must be run as root. + # * Check for "GITHUB_ACTIONS" environmant variable (GitHub Action). + + +def collect_system(info_add): boot_id = read_first_line("/proc/sys/kernel/random/boot_id") if boot_id: info_add('system.boot_id', boot_id) @@ -1152,6 +1200,15 @@ def collect_linux(info_add): uptime = f'{uptime} sec' info_add('system.uptime', uptime) + virt = detect_virt() + if virt: + info_add('system.virt', virt) + + if APPLE: + hardware = run_command(['sysctl', '-n', 'hw.model']) + if hardware: + info_add('system.hardware', hardware) + def collect_info(info): error = False @@ -1194,7 +1251,7 @@ def collect_info(info): collect_zlib, collect_zstd, collect_libregrtest_utils, - collect_linux, + collect_system, # Collecting from tests should be last as they have side effects. collect_test_socket,

1 0

gh-152682: Fix NULL dereference on OOM in `symtable_visit_type_param_bound_or_default` (#152684)
by sobolevn June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/10ed03edf128ed1101ab8d04bcd715f203… commit: 10ed03edf128ed1101ab8d04bcd715f2033fec55 branch: main author: Petr Vaganov <petrvaganoff(a)gmail.com> committer: sobolevn <mail(a)sobolevn.me> date: 2026-06-30T14:45:25Z summary: gh-152682: Fix NULL dereference on OOM in `symtable_visit_type_param_bound_or_default` (#152684) In `symtable_visit_type_param_bound_or_default()`, when a reserved name (e.g. `__classdict__`) is used as a type parameter, `PyUnicode_FromFormat()` is called to build the SyntaxError message. If the allocation fails and returns NULL, the subsequent `PyErr_SetObject()` and `Py_DECREF()` calls would dereference NULL, causing a segfault. Fix by returning 0 immediately when `PyUnicode_FromFormat()` returns NULL. This propagates the MemoryError set by `PyUnicode_FromFormat()`. The bug was introduced in gh-128632 (commit 891c61c). files: A Misc/NEWS.d/next/Core_and_Builtins/2026-06-30-14-00-00.gh-issue-152682.yId7e5.rst M Lib/test/test_syntax.py M Python/symtable.c diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 04e60c74ce1bea..80577cf5c84fac 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -2861,6 +2861,7 @@ def f(x: *b) import unittest from test import support +from test.support.script_helper import assert_python_ok class SyntaxWarningTest(unittest.TestCase): def check_warning(self, code, errtext, filename="<testcase>", mode="exec"): @@ -3201,6 +3202,22 @@ class A: class B[{name}]: pass """, "<testcase>", mode="exec") + @support.nomemtest + def test_disallowed_type_param_names_oom(self): + # gh-152682: Don't crash on OOM when formatting the SyntaxError message + # in symtable_visit_type_param_bound_or_default. + code = textwrap.dedent("""\ + import _testcapi + _testcapi.set_nomemory(0) + try: + compile("class A[__classdict__]: pass", "<string>", "exec") + except MemoryError: + pass + else: + raise RuntimeError('MemoryError not raised') + """) + assert_python_ok("-c", code) + @support.cpython_only def test_nested_named_except_blocks(self): code = "" diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-06-30-14-00-00.gh-issue-152682.yId7e5.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-30-14-00-00.gh-issue-152682.yId7e5.rst new file mode 100644 index 00000000000000..aba0b594382bcf --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-30-14-00-00.gh-issue-152682.yId7e5.rst @@ -0,0 +1,3 @@ +Fix NULL pointer dereference in :func:`compile` when a reserved name (e.g. +``__classdict__``) is used as a type parameter name and memory allocation +fails while formatting the error message. diff --git a/Python/symtable.c b/Python/symtable.c index 00ac510fe76b97..e3e89ab403a607 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -2678,6 +2678,9 @@ symtable_visit_type_param_bound_or_default( PyObject *error_msg = PyUnicode_FromFormat("reserved name '%U' cannot be " "used for type parameter", name); + if (error_msg == NULL) { + return 0; + } PyErr_SetObject(PyExc_SyntaxError, error_msg); Py_DECREF(error_msg); SET_ERROR_LOCATION(st->st_filename, LOCATION(tp));

1 0

gh-151881: Skip tk_inactive negativity check on Windows (GH-152683)
by serhiy-storchaka June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/2303eea150602874d55d965eb3f83d6e80… commit: 2303eea150602874d55d965eb3f83d6e80649118 branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2026-06-30T14:25:42Z summary: gh-151881: Skip tk_inactive negativity check on Windows (GH-152683) On Windows the inactivity time can overflow to a negative value (Tk ticket 3cb7c4ac72d4). Co-authored-by: Claude Opus 4.8 <noreply(a)anthropic.com> files: M Lib/test/test_tkinter/test_misc.py diff --git a/Lib/test/test_tkinter/test_misc.py b/Lib/test/test_tkinter/test_misc.py index e6221f7089704d..5f75b8d245b3e9 100644 --- a/Lib/test/test_tkinter/test_misc.py +++ b/Lib/test/test_tkinter/test_misc.py @@ -592,7 +592,10 @@ def test_tk_inactive(self): ms = self.root.tk_inactive() self.assertIsInstance(ms, int) # A count of milliseconds, or -1 if the windowing system lacks support. - self.assertGreaterEqual(ms, -1) + if self.root._windowingsystem != 'win32': + # On Windows the value can overflow to a negative number + # (Tk ticket 3cb7c4ac72d4). + self.assertGreaterEqual(ms, -1) # Resetting the timer returns None and does not raise. self.assertIsNone(self.root.tk_inactive(reset=True))

1 0

gh-152546: Refactor `mappingproxy.__new__` to use `PyDictProxy_New` (#152547)
by sobolevn June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/38df9976cccd3358047dba79e73725d1e5… commit: 38df9976cccd3358047dba79e73725d1e5ae5a6b branch: main author: sobolevn <mail(a)sobolevn.me> committer: sobolevn <mail(a)sobolevn.me> date: 2026-06-30T16:58:31+03:00 summary: gh-152546: Refactor `mappingproxy.__new__` to use `PyDictProxy_New` (#152547) files: M Objects/descrobject.c diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 30444b7d677424..1c068e96f24532 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -1253,32 +1253,6 @@ mappingproxy_check_mapping(PyObject *mapping) return 0; } -/*[clinic input] -@classmethod -mappingproxy.__new__ as mappingproxy_new - - mapping: object - -Read-only proxy of a mapping. -[clinic start generated code]*/ - -static PyObject * -mappingproxy_new_impl(PyTypeObject *type, PyObject *mapping) -/*[clinic end generated code: output=65f27f02d5b68fa7 input=c156df096ef7590c]*/ -{ - mappingproxyobject *mappingproxy; - - if (mappingproxy_check_mapping(mapping) == -1) - return NULL; - - mappingproxy = PyObject_GC_New(mappingproxyobject, &PyDictProxy_Type); - if (mappingproxy == NULL) - return NULL; - mappingproxy->mapping = Py_NewRef(mapping); - _PyObject_GC_TRACK(mappingproxy); - return (PyObject *)mappingproxy; -} - PyObject * PyDictProxy_New(PyObject *mapping) { @@ -1295,6 +1269,22 @@ PyDictProxy_New(PyObject *mapping) return (PyObject *)pp; } +/*[clinic input] +@classmethod +mappingproxy.__new__ as mappingproxy_new + + mapping: object + +Read-only proxy of a mapping. +[clinic start generated code]*/ + +static PyObject * +mappingproxy_new_impl(PyTypeObject *type, PyObject *mapping) +/*[clinic end generated code: output=65f27f02d5b68fa7 input=c156df096ef7590c]*/ +{ + return PyDictProxy_New(mapping); +} + /* --- Wrapper object for "slot" methods --- */

1 0

[3.15] gh-151126: Fix a possible crash during the startup with no memory under `Py_STACKREF_DEBUG` (GH-152478) (#152677)
by sobolevn June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/0f3e91b1f87697fe143032577f3e2f0f96… commit: 0f3e91b1f87697fe143032577f3e2f0f964fe672 branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: sobolevn <mail(a)sobolevn.me> date: 2026-06-30T11:56:43Z summary: [3.15] gh-151126: Fix a possible crash during the startup with no memory under `Py_STACKREF_DEBUG` (GH-152478) (#152677) gh-151126: Fix a possible crash during the startup with no memory under `Py_STACKREF_DEBUG` (GH-152478) (cherry picked from commit ecdef1773006529b0fea6639d0effeecbb41679c) Co-authored-by: sobolevn <mail(a)sobolevn.me> files: M Python/pystate.c diff --git a/Python/pystate.c b/Python/pystate.c index b0c924adbe0fc2..8349df1b573952 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -655,6 +655,9 @@ init_interpreter(PyInterpreterState *interp, NULL, &alloc ); + if (interp->open_stackrefs_table == NULL) { + return _PyStatus_NO_MEMORY(); + } # ifdef Py_STACKREF_CLOSE_DEBUG interp->closed_stackrefs_table = _Py_hashtable_new_full( _Py_hashtable_hash_ptr, @@ -663,6 +666,9 @@ init_interpreter(PyInterpreterState *interp, NULL, &alloc ); + if (interp->closed_stackrefs_table == NULL) { + return _PyStatus_NO_MEMORY(); + } # endif _Py_stackref_associate(interp, Py_None, PyStackRef_None); _Py_stackref_associate(interp, Py_False, PyStackRef_False);

1 0

[3.14] gh-151126: Fix a possible crash during the startup with no memory under `Py_STACKREF_DEBUG` (GH-152478) (#152678)
by sobolevn June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/fd4965de331ccbc0bc5003664275f6ccbc… commit: fd4965de331ccbc0bc5003664275f6ccbcac160e branch: 3.14 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: sobolevn <mail(a)sobolevn.me> date: 2026-06-30T11:55:16Z summary: [3.14] gh-151126: Fix a possible crash during the startup with no memory under `Py_STACKREF_DEBUG` (GH-152478) (#152678) gh-151126: Fix a possible crash during the startup with no memory under `Py_STACKREF_DEBUG` (GH-152478) (cherry picked from commit ecdef1773006529b0fea6639d0effeecbb41679c) Co-authored-by: sobolevn <mail(a)sobolevn.me> files: M Python/pystate.c diff --git a/Python/pystate.c b/Python/pystate.c index 06672ceb2143c9..d1505be4acf50f 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -694,6 +694,9 @@ init_interpreter(PyInterpreterState *interp, NULL, &alloc ); + if (interp->open_stackrefs_table == NULL) { + return _PyStatus_NO_MEMORY(); + } # ifdef Py_STACKREF_CLOSE_DEBUG interp->closed_stackrefs_table = _Py_hashtable_new_full( _Py_hashtable_hash_ptr, @@ -702,6 +705,9 @@ init_interpreter(PyInterpreterState *interp, NULL, &alloc ); + if (interp->closed_stackrefs_table == NULL) { + return _PyStatus_NO_MEMORY(); + } # endif _Py_stackref_associate(interp, Py_None, PyStackRef_None); _Py_stackref_associate(interp, Py_False, PyStackRef_False);

1 0

gh-151126: Fix a possible crash during the startup with no memory under `Py_STACKREF_DEBUG` (#152478)
by sobolevn June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/ecdef1773006529b0fea6639d0effeecbb… commit: ecdef1773006529b0fea6639d0effeecbb41679c branch: main author: sobolevn <mail(a)sobolevn.me> committer: sobolevn <mail(a)sobolevn.me> date: 2026-06-30T14:28:17+03:00 summary: gh-151126: Fix a possible crash during the startup with no memory under `Py_STACKREF_DEBUG` (#152478) files: M Python/pystate.c diff --git a/Python/pystate.c b/Python/pystate.c index 29f13e92e0dd1f..e90642fa882db7 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -656,6 +656,9 @@ init_interpreter(PyInterpreterState *interp, NULL, &alloc ); + if (interp->open_stackrefs_table == NULL) { + return _PyStatus_NO_MEMORY(); + } # ifdef Py_STACKREF_CLOSE_DEBUG interp->closed_stackrefs_table = _Py_hashtable_new_full( _Py_hashtable_hash_ptr, @@ -664,6 +667,9 @@ init_interpreter(PyInterpreterState *interp, NULL, &alloc ); + if (interp->closed_stackrefs_table == NULL) { + return _PyStatus_NO_MEMORY(); + } # endif _Py_stackref_associate(interp, Py_None, PyStackRef_None); _Py_stackref_associate(interp, Py_False, PyStackRef_False);

1 0

[3.14] gh-151029: Fix `test_remote_exec_deleted_static_executable` on static installed builds (GH-152653) (#152669)
by StanFromIreland June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/940be2e2161883d1a908f5020369b85834… commit: 940be2e2161883d1a908f5020369b858345beace branch: 3.14 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: StanFromIreland <stan(a)python.org> date: 2026-06-30T13:25:34+02:00 summary: [3.14] gh-151029: Fix `test_remote_exec_deleted_static_executable` on static installed builds (GH-152653) (#152669) (cherry picked from commit 03efeef226b774f937056e95e0cdb8f7d37c6532) Co-authored-by: Stan Ulbrych <stan(a)python.org> files: M Lib/test/test_sys.py diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 4cd9b7f4af25d4..e31020b6f8549e 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -2258,8 +2258,8 @@ def test_remote_exec_deleted_libpython(self): def test_remote_exec_deleted_static_executable(self): """Test remote exec when the target static executable was deleted.""" build_dir = sysconfig.get_config_var('abs_builddir') - srcdir = sysconfig.get_config_var('srcdir') - if not build_dir or not srcdir: + stdlib_dir = os.path.dirname(os.path.abspath(os.__file__)) + if not build_dir or not os.path.isdir(stdlib_dir): self.skipTest('cannot determine build-tree locations') pybuilddir_txt = os.path.join(build_dir, 'pybuilddir.txt') @@ -2276,8 +2276,7 @@ def test_remote_exec_deleted_static_executable(self): copied_build_dir = os.path.join(copied_root, 'build') copied_pybuilddir = os.path.join(copied_build_dir, pybuilddir) os.makedirs(os.path.dirname(copied_pybuilddir)) - os.symlink(os.path.join(srcdir, 'Lib'), - os.path.join(copied_root, 'Lib')) + os.symlink(stdlib_dir, os.path.join(copied_root, 'Lib')) os.symlink(source_ext_dir, copied_pybuilddir) shutil.copy2(pybuilddir_txt, os.path.join(copied_build_dir, 'pybuilddir.txt'))

1 0

[3.15] gh-151029: Fix `test_remote_exec_deleted_static_executable` on static installed builds (GH-152653) (#152670)
by StanFromIreland June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/eebdbfdec524df8a6f42aed51fc52461b9… commit: eebdbfdec524df8a6f42aed51fc52461b9ed49c2 branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: StanFromIreland <stan(a)python.org> date: 2026-06-30T13:25:27+02:00 summary: [3.15] gh-151029: Fix `test_remote_exec_deleted_static_executable` on static installed builds (GH-152653) (#152670) (cherry picked from commit 03efeef226b774f937056e95e0cdb8f7d37c6532) Co-authored-by: Stan Ulbrych <stan(a)python.org> files: M Lib/test/test_sys.py diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 049b36a82c8226..84bc428e196c3e 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -2292,8 +2292,8 @@ def test_remote_exec_deleted_libpython(self): def test_remote_exec_deleted_static_executable(self): """Test remote exec when the target static executable was deleted.""" build_dir = sysconfig.get_config_var('abs_builddir') - srcdir = sysconfig.get_config_var('srcdir') - if not build_dir or not srcdir: + stdlib_dir = os.path.dirname(os.path.abspath(os.__file__)) + if not build_dir or not os.path.isdir(stdlib_dir): self.skipTest('cannot determine build-tree locations') pybuilddir_txt = os.path.join(build_dir, 'pybuilddir.txt') @@ -2310,8 +2310,7 @@ def test_remote_exec_deleted_static_executable(self): copied_build_dir = os.path.join(copied_root, 'build') copied_pybuilddir = os.path.join(copied_build_dir, pybuilddir) os.makedirs(os.path.dirname(copied_pybuilddir)) - os.symlink(os.path.join(srcdir, 'Lib'), - os.path.join(copied_root, 'Lib')) + os.symlink(stdlib_dir, os.path.join(copied_root, 'Lib')) os.symlink(source_ext_dir, copied_pybuilddir) shutil.copy2(pybuilddir_txt, os.path.join(copied_build_dir, 'pybuilddir.txt'))

1 0

[3.14] gh-152635: Raise MemoryError when the lock allocation fails in `_interpchannels.create()` (GH-152642) (#152672)
by sobolevn June 30, 2026

June 30, 2026

https://github.com/python/cpython/commit/589833e0a4fae6b476107f5fb345d8058c… commit: 589833e0a4fae6b476107f5fb345d8058ce2712a branch: 3.14 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: sobolevn <mail(a)sobolevn.me> date: 2026-06-30T11:24:38Z summary: [3.14] gh-152635: Raise MemoryError when the lock allocation fails in `_interpchannels.create()` (GH-152642) (#152672) gh-152635: Raise MemoryError when the lock allocation fails in `_interpchannels.create()` (GH-152642) Previously, an allocation failure when creating the lock for a channel in `_interpchannels` would trigger an assert. Caused by `handle_channel_error` being passed an error code of -1 which is only allowed if an exception has been set. (in this case, no exception was set) `channelsmod_create` now forwards the error code from `channel_create` which `handle_channel_error` already handled. (cherry picked from commit b383aa6e1a8ea53fdeed88c71fbc34d8b2d1fde9) Co-authored-by: Steve Stagg <stestagg(a)gmail.com> Co-authored-by: sobolevn <mail(a)sobolevn.me> files: A Misc/NEWS.d/next/Core_and_Builtins/2026-06-29-23-29-14.gh-issue-152635.O21J0O.rst M Modules/_interpchannelsmodule.c diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-06-29-23-29-14.gh-issue-152635.O21J0O.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-29-23-29-14.gh-issue-152635.O21J0O.rst new file mode 100644 index 00000000000000..dadb25fc7c4477 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-29-23-29-14.gh-issue-152635.O21J0O.rst @@ -0,0 +1,2 @@ +Fix a crash caused when running out of memory creating a +:mod:`!_interpchannels` channel. Now a :exc:`MemoryError` is correctly raised. diff --git a/Modules/_interpchannelsmodule.c b/Modules/_interpchannelsmodule.c index 09e0d310b00cd9..afaa4256277181 100644 --- a/Modules/_interpchannelsmodule.c +++ b/Modules/_interpchannelsmodule.c @@ -354,7 +354,7 @@ clear_module_state(module_state *state) #define ERR_CHANNEL_INTERP_CLOSED -4 #define ERR_CHANNEL_EMPTY -5 #define ERR_CHANNEL_NOT_EMPTY -6 -#define ERR_CHANNEL_MUTEX_INIT -7 +#define ERR_CHANNEL_MUTEX_INIT -7 // currently unused #define ERR_CHANNELS_MUTEX_INIT -8 #define ERR_NO_NEXT_CHANNEL_ID -9 #define ERR_CHANNEL_CLOSED_WAITING -10 @@ -427,10 +427,6 @@ handle_channel_error(int err, PyObject *mod, int64_t cid) "if not empty (try force=True)", cid); } - else if (err == ERR_CHANNEL_MUTEX_INIT) { - PyErr_SetString(state->ChannelError, - "can't initialize mutex for new channel"); - } else if (err == ERR_CHANNELS_MUTEX_INIT) { PyErr_SetString(state->ChannelError, "can't initialize mutex for channel management"); @@ -1744,7 +1740,8 @@ channel_create(_channels *channels, struct _channeldefaults defaults) { PyThread_type_lock mutex = PyThread_allocate_lock(); if (mutex == NULL) { - return ERR_CHANNEL_MUTEX_INIT; + PyErr_NoMemory(); + return -1; } _channel_state *chan = _channel_new(mutex, defaults); if (chan == NULL) { @@ -2938,7 +2935,7 @@ channelsmod_create(PyObject *self, PyObject *args, PyObject *kwds) int64_t cid = channel_create(&_globals.channels, defaults); if (cid < 0) { - (void)handle_channel_error(-1, self, cid); + (void)handle_channel_error(cid, self, cid); return NULL; } module_state *state = get_module_state(self);

1 0