Mailman 3 - Python-checkins

gh-145177: Bump Emscripten to 6.0.0 (#151611)
by freakboy3742 18 জুন, 2026

18 জুন, 2026

https://github.com/python/cpython/commit/d701f8edbe2884e3e039f3683deabd2d43… commit: d701f8edbe2884e3e039f3683deabd2d43fa3b2e branch: main author: Hood Chatham <roberthoodchatham(a)gmail.com> committer: freakboy3742 <russell(a)keith-magee.com> date: 2026-06-19T07:29:33+08:00 summary: gh-145177: Bump Emscripten to 6.0.0 (#151611) Bumps Emscripten to 6.0.0, and fixes related issues in getentropy() and umask(). files: M Lib/test/test_platform.py M Platforms/emscripten/config.toml M Python/emscripten_syscalls.c M configure M configure.ac diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index 63c130813ec4972..3503eaefaf8e9e7 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -534,7 +534,20 @@ def test_ios_ver(self): def test_libc_ver(self): if support.is_emscripten: - assert platform.libc_ver() == ("emscripten", "4.0.19") + import tomllib + from pathlib import Path + + # Get expected emscripten version from emscripten config + config_path = ( + Path(__file__).parents[2] / "Platforms/emscripten/config.toml" + ) + with open(config_path, "rb") as fp: + emscripten_version = tomllib.load(fp)["emscripten-version"] + + self.assertEqual( + platform.libc_ver(), ("emscripten", emscripten_version) + ) + return # check that libc_ver(executable) doesn't raise an exception if os.path.isdir(sys.executable) and \ diff --git a/Platforms/emscripten/config.toml b/Platforms/emscripten/config.toml index 401e9396ddbb009..389d2ea66ce948e 100644 --- a/Platforms/emscripten/config.toml +++ b/Platforms/emscripten/config.toml @@ -1,7 +1,7 @@ # Any data that can vary between Python versions is to be kept in this file. # This allows for blanket copying of the Emscripten build code between supported # Python versions. -emscripten-version = "4.0.19" +emscripten-version = "6.0.0" node-version = "24" test-args = [ "-m", "test", diff --git a/Python/emscripten_syscalls.c b/Python/emscripten_syscalls.c index 98ee44276e53e03..b0c370ced36cc33 100644 --- a/Python/emscripten_syscalls.c +++ b/Python/emscripten_syscalls.c @@ -23,24 +23,27 @@ int __syscall_getuid32(void) { return __syscall_getuid32_js(); } -EM_JS(int, __syscall_umask_js, (int mask), { - // If we're in node and we can, call native process.umask() +// Emscripten's syscall layer tracks the umask in SYSCALLS.currentUmask and +// applies it itself when creating files and directories. We mount the real +// filesystem via NODEFS, which applies proces.umask() to everything as well. To +// avoid masking the mode twice, read and zero out process umask at startup, +// and store it as emscripten's umask. +EM_JS(void, __syscall_init_umask_js, (void), { if (ENVIRONMENT_IS_NODE) { try { - return process.umask(mask); - } catch(e) { - // oops... - // NodeJS docs: "In Worker threads, process.umask(mask) will throw an exception." - // umask docs: "This system call always succeeds" - return 0; + // process.umask(0) returns the previous umask and sets it to 0. + SYSCALLS.currentUmask = process.umask(0); + } catch (e) { + // NodeJS docs: "In Worker threads, process.umask(mask) will throw an + // exception." In that case just keep emscripten's default umask. } } - // Fall back to the stub case of returning 0. - return 0; }) -int __syscall_umask(int mask) { - return __syscall_umask_js(mask); +EM_JS_DEPS(__syscall_init_umask, "$SYSCALLS"); + +__attribute__((constructor)) void __syscall_init_umask(void) { + __syscall_init_umask_js(); } #include <wasi/api.h> @@ -290,6 +293,26 @@ int __syscall_poll(intptr_t fds, int nfds, int timeout) { return __block_for_int(p); } + +// Workaround for an Emscripten bug: getentropy(buffer, 1) returns the single +// byte of entropy as the return code. Fixed upstream by +// emscripten-core/emscripten#27122 +int __real_getentropy(void*, size_t); + +int __wrap_getentropy(void *buffer, size_t len) { + if (len != 1) { + return __real_getentropy(buffer, len); + } + // Length is 1. Workaround is to get two bytes of entropy and write the + // first one into the original target buffer. + uint8_t tmp[2]; + int ret = __real_getentropy(tmp, 2); + if (ret == 0) { + *(uint8_t *)buffer = tmp[0]; + } + return ret; +} + #include <sys/ioctl.h> int syscall_ioctl_orig(int fd, int request, void* varargs) diff --git a/configure b/configure index 7408fac738b8a39..d73a88d04016ddb 100755 --- a/configure +++ b/configure @@ -9803,6 +9803,8 @@ fi as_fn_append LINKFORSHARED " -sSTACK_SIZE=5MB" as_fn_append LINKFORSHARED " -sTEXTDECODER=2" + as_fn_append LDFLAGS_NODIST " -Wl,--wrap=getentropy" + if test "x$enable_wasm_dynamic_linking" = xyes then : diff --git a/configure.ac b/configure.ac index dbc781b545dd362..8ba134c77b34129 100644 --- a/configure.ac +++ b/configure.ac @@ -2411,6 +2411,10 @@ AS_CASE([$ac_sys_system], dnl Avoid bugs in JS fallback string decoding path AS_VAR_APPEND([LINKFORSHARED], [" -sTEXTDECODER=2"]) + dnl Workaround for a bug in Emscipten libc's getentropy. See + dnl __wrap_getentropy in Python/emscripten_syscalls.c. + AS_VAR_APPEND([LDFLAGS_NODIST], [" -Wl,--wrap=getentropy"]) + AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [ AS_VAR_APPEND([LINKFORSHARED], [" -sMAIN_MODULE"]) ])

1 0

gh-151229: Add CI to prevent JIT stress test regression (#151647)
by corona10 18 জুন, 2026

18 জুন, 2026

https://github.com/python/cpython/commit/17720b184d333c7a869d801ed1a56cd91f… commit: 17720b184d333c7a869d801ed1a56cd91f42bdc2 branch: main author: Donghee Na <donghee.na(a)python.org> committer: corona10 <donghee.na92(a)gmail.com> date: 2026-06-19T04:57:41+09:00 summary: gh-151229: Add CI to prevent JIT stress test regression (#151647) files: M .github/workflows/jit.yml diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index 2f024ad52f3091..66bff36fe5e90c 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -183,6 +183,9 @@ jobs: - name: JIT without optimizations (Debug) configure_flags: --enable-experimental-jit --with-pydebug test_env: "PYTHON_UOPS_OPTIMIZE=0" + - name: JIT with stress testing (Debug) + configure_flags: --enable-experimental-jit --with-pydebug + test_env: "PYTHON_JIT_STRESS=1" - name: JIT with tail calling interpreter configure_flags: --enable-experimental-jit --with-tail-call-interp --with-pydebug use_clang: true

1 0

docs: Fix broken reference of parameter type in `library/logging.rst` (GH-151645)
by vsajip 18 জুন, 2026

18 জুন, 2026

https://github.com/python/cpython/commit/15d74068f3a2f093e0b73dd7a74938fa6d… commit: 15d74068f3a2f093e0b73dd7a74938fa6d7f7460 branch: main author: mushitoriami <232557021+mushitoriami(a)users.noreply.github.com> committer: vsajip <vinay_sajip(a)yahoo.co.uk> date: 2026-06-18T18:45:04+01:00 summary: docs: Fix broken reference of parameter type in `library/logging.rst` (GH-151645) files: M Doc/library/logging.rst diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index aba530844d7177..a3d117c1070241 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -690,7 +690,7 @@ Formatter Objects :param defaults: A dictionary with default values to use in custom fields. For example, ``logging.Formatter('%(ip)s %(message)s', defaults={"ip": None})`` - :type defaults: dict[str, Any] + :type defaults: dict[str, typing.Any] .. versionchanged:: 3.2 Added the *style* parameter.

1 0

[3.15] gh-146353: Document `PyBytesWriter_GetData` pointer validity (GH-151418) (GH-151664)
by ZeroIntensity 18 জুন, 2026

18 জুন, 2026

https://github.com/python/cpython/commit/fd3c510827d5bc0f92571754ee7495078f… commit: fd3c510827d5bc0f92571754ee7495078fc60086 branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ZeroIntensity <zintensitydev(a)gmail.com> date: 2026-06-18T17:39:20Z summary: [3.15] gh-146353: Document `PyBytesWriter_GetData` pointer validity (GH-151418) (GH-151664) gh-146353: Document `PyBytesWriter_GetData` pointer validity (GH-151418) (cherry picked from commit e99b319682fe984074e32f52354dbec23ded4d0a) Co-authored-by: Harjoth Khara <harjoth.khara(a)gmail.com> files: M Doc/c-api/bytes.rst diff --git a/Doc/c-api/bytes.rst b/Doc/c-api/bytes.rst index f56bcd6333a37d..fa77d3d38ff89f 100644 --- a/Doc/c-api/bytes.rst +++ b/Doc/c-api/bytes.rst @@ -384,14 +384,18 @@ Getters Get the writer size. + The function does not invalidate pointers returned by + :c:func:`PyBytesWriter_GetData`. + The function cannot fail. .. c:function:: void* PyBytesWriter_GetData(PyBytesWriter *writer) Get the writer data: start of the internal buffer. - The pointer is valid until :c:func:`PyBytesWriter_Finish` or - :c:func:`PyBytesWriter_Discard` is called on *writer*. + The pointer remains valid until a :c:type:`PyBytesWriter` function other + than :c:func:`PyBytesWriter_GetData` or :c:func:`PyBytesWriter_GetSize` is + called on *writer*. The function cannot fail.

1 0

gh-146353: Document `PyBytesWriter_GetData` pointer validity (GH-151418)
by ZeroIntensity 18 জুন, 2026

18 জুন, 2026

https://github.com/python/cpython/commit/e99b319682fe984074e32f52354dbec23d… commit: e99b319682fe984074e32f52354dbec23ded4d0a branch: main author: Harjoth Khara <harjoth.khara(a)gmail.com> committer: ZeroIntensity <zintensitydev(a)gmail.com> date: 2026-06-18T12:55:06-04:00 summary: gh-146353: Document `PyBytesWriter_GetData` pointer validity (GH-151418) files: M Doc/c-api/bytes.rst diff --git a/Doc/c-api/bytes.rst b/Doc/c-api/bytes.rst index f56bcd6333a37d..fa77d3d38ff89f 100644 --- a/Doc/c-api/bytes.rst +++ b/Doc/c-api/bytes.rst @@ -384,14 +384,18 @@ Getters Get the writer size. + The function does not invalidate pointers returned by + :c:func:`PyBytesWriter_GetData`. + The function cannot fail. .. c:function:: void* PyBytesWriter_GetData(PyBytesWriter *writer) Get the writer data: start of the internal buffer. - The pointer is valid until :c:func:`PyBytesWriter_Finish` or - :c:func:`PyBytesWriter_Discard` is called on *writer*. + The pointer remains valid until a :c:type:`PyBytesWriter` function other + than :c:func:`PyBytesWriter_GetData` or :c:func:`PyBytesWriter_GetSize` is + called on *writer*. The function cannot fail.

1 0

[3.15] gh-86726: Add few missing versionadded directives (GH-151662) (GH-151663)
by serhiy-storchaka 18 জুন, 2026

18 জুন, 2026

https://github.com/python/cpython/commit/cafe39f78acd82dac81ea7b443ebe3c73b… commit: cafe39f78acd82dac81ea7b443ebe3c73be48242 branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2026-06-18T15:56:14Z summary: [3.15] gh-86726: Add few missing versionadded directives (GH-151662) (GH-151663) Pack.pack_content, Place.place_content and Grid.grid_content were added in 3.15. (cherry picked from commit bfecfcc2a860071c8e5022ac512bde94e0fb5f76) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 8507656e50fa33..b0421721bf8d7e 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -2979,6 +2979,8 @@ Base and mixin classes Same as :meth:`Misc.pack_content`. :meth:`content` is an alias of :meth:`!pack_content`. + .. versionadded:: 3.15 + .. class:: Place() @@ -3073,6 +3075,8 @@ Base and mixin classes Same as :meth:`Misc.place_content`. :meth:`content` is an alias of :meth:`!place_content`. + .. versionadded:: 3.15 + .. class:: Grid() @@ -3221,6 +3225,8 @@ Base and mixin classes Same as :meth:`Misc.grid_content`. :meth:`content` is an alias of :meth:`!grid_content`. + .. versionadded:: 3.15 + .. class:: XView()

1 0

gh-86726: Add few missing versionadded directives (GH-151662)
by serhiy-storchaka 18 জুন, 2026

18 জুন, 2026

https://github.com/python/cpython/commit/bfecfcc2a860071c8e5022ac512bde94e0… commit: bfecfcc2a860071c8e5022ac512bde94e0fb5f76 branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2026-06-18T15:46:57Z summary: gh-86726: Add few missing versionadded directives (GH-151662) Pack.pack_content, Place.place_content and Grid.grid_content were added in 3.15. files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 8507656e50fa33..b0421721bf8d7e 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -2979,6 +2979,8 @@ Base and mixin classes Same as :meth:`Misc.pack_content`. :meth:`content` is an alias of :meth:`!pack_content`. + .. versionadded:: 3.15 + .. class:: Place() @@ -3073,6 +3075,8 @@ Base and mixin classes Same as :meth:`Misc.place_content`. :meth:`content` is an alias of :meth:`!place_content`. + .. versionadded:: 3.15 + .. class:: Grid() @@ -3221,6 +3225,8 @@ Base and mixin classes Same as :meth:`Misc.grid_content`. :meth:`content` is an alias of :meth:`!grid_content`. + .. versionadded:: 3.15 + .. class:: XView()

1 0

[3.11] Replace deprecated action with RtD app (GH-149111) (GH-150233) (#151657)
by hugovk 18 জুন, 2026

18 জুন, 2026

https://github.com/python/cpython/commit/79f66145c028666006fa1f76513db2846a… commit: 79f66145c028666006fa1f76513db2846a148807 branch: 3.11 author: Hugo van Kemenade <1324225+hugovk(a)users.noreply.github.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2026-06-18T18:09:17+03:00 summary: [3.11] Replace deprecated action with RtD app (GH-149111) (GH-150233) (#151657) Co-authored-by: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> files: D .github/workflows/documentation-links.yml diff --git a/.github/workflows/documentation-links.yml b/.github/workflows/documentation-links.yml deleted file mode 100644 index e35c0182ff40242..000000000000000 --- a/.github/workflows/documentation-links.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Read the Docs PR preview -# Automatically edits a pull request's descriptions with a link -# to the documentation's preview on Read the Docs. - -on: - pull_request_target: - types: - - opened - paths: - - 'Doc/**' - - '.github/workflows/doc.yml' - -permissions: - pull-requests: write - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - documentation-links: - runs-on: ubuntu-latest - steps: - - uses: readthedocs/actions/preview@b8bba1484329bda1a3abe986df7ebc80a8950333 # v1.5 - with: - project-slug: "cpython-previews" - single-version: "true"

1 0

[3.14] gh-86726: Fix the documented return type of tkinter info_patchlevel() (GH-151655) (GH-151659)
by serhiy-storchaka 18 জুন, 2026

18 জুন, 2026

https://github.com/python/cpython/commit/2e873f7bb1f2b52c97ff225194cb71cde9… commit: 2e873f7bb1f2b52c97ff225194cb71cde93ab498 branch: 3.14 author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2026-06-18T14:45:00Z summary: [3.14] gh-86726: Fix the documented return type of tkinter info_patchlevel() (GH-151655) (GH-151659) It returns a sys.version_info-like named tuple, not a string. (cherry picked from commit 3cd02a1c2da023974464fd1155982a16474f331b) Co-authored-by: Claude Opus 4.8 (1M context) <noreply(a)anthropic.com> files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 4b7aae3cc559ec..e95d838506bc7d 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -2307,7 +2307,13 @@ Base and mixin classes .. method:: info_patchlevel() - Return the Tcl/Tk patch level as a string, for example ``'8.6.15'``. + Return the Tcl/Tk patch level as a named tuple with the same five fields + as :data:`sys.version_info`: *major*, *minor*, *micro*, *releaselevel* + and *serial*. + *releaselevel* is ``'alpha'``, ``'beta'`` or ``'final'``. + Converting it to a string gives the version in the usual Tcl/Tk notation, + for example ``'9.0.3'`` for a final release or ``'9.1b2'`` for a + pre-release. .. versionadded:: 3.11

1 0

[3.15] gh-86726: Fix the documented return type of tkinter info_patchlevel() (GH-151655) (GH-151658)
by serhiy-storchaka 18 জুন, 2026

18 জুন, 2026

https://github.com/python/cpython/commit/821e97b999e2f1857921cf944adf86c815… commit: 821e97b999e2f1857921cf944adf86c815d1a599 branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2026-06-18T14:44:51Z summary: [3.15] gh-86726: Fix the documented return type of tkinter info_patchlevel() (GH-151655) (GH-151658) It returns a sys.version_info-like named tuple, not a string. (cherry picked from commit 3cd02a1c2da023974464fd1155982a16474f331b) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply(a)anthropic.com> files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 5c40eadcf49c7c..8507656e50fa33 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -2333,7 +2333,13 @@ Base and mixin classes .. method:: info_patchlevel() - Return the Tcl/Tk patch level as a string, for example ``'9.1.0'``. + Return the Tcl/Tk patch level as a named tuple with the same five fields + as :data:`sys.version_info`: *major*, *minor*, *micro*, *releaselevel* + and *serial*. + *releaselevel* is ``'alpha'``, ``'beta'`` or ``'final'``. + Converting it to a string gives the version in the usual Tcl/Tk notation, + for example ``'9.0.3'`` for a final release or ``'9.1b2'`` for a + pre-release. .. versionadded:: 3.11

1 0