Merge branch 'main' into gc-visit-objects-uaf

Author: sergey-miryanov

.gitattributes

@@ -102,6 +102,7 @@ Modules/_testinternalcapi/test_cases.c.h            generated
 Modules/_testinternalcapi/test_targets.h            generated
 PC/python3dll.c                                     generated
 Parser/parser.c                                     generated
+Parser/parser_invalid.c                             generated
 Parser/token.c                                      generated
 Programs/test_frozenmain.h                          generated
 Python/Python-ast.c                                 generated

.github/CODEOWNERS

@@ -283,11 +283,10 @@ Programs/_bootstrap_python.c  @ericsnowcurrently @FFY00
 Programs/python.c             @ericsnowcurrently @FFY00
 
 # JIT
-.github/workflows/jit.yml     @savannahostrowski
-Include/internal/pycore_jit.h @brandtbucher @savannahostrowski @diegorusso
-Python/jit.c                  @brandtbucher @savannahostrowski @diegorusso
-Tools/jit/                    @brandtbucher @savannahostrowski @diegorusso
-InternalDocs/jit.md           @brandtbucher @savannahostrowski @diegorusso @AA-Turner
+Include/internal/pycore_jit.h @brandtbucher @diegorusso
+Python/jit.c                  @brandtbucher @diegorusso
+Tools/jit/                    @brandtbucher @diegorusso
+InternalDocs/jit.md           @brandtbucher @diegorusso @AA-Turner
 
 # Lazy imports (PEP 810)
 .github/workflows/reusable-test-lazy-imports-all.yml    @yhg1s @DinoV @pablogsal
@@ -297,12 +296,13 @@ Lib/test/test_lazy_import                               @yhg1s @DinoV @pablogsal
 
 # Micro-op / μop / Tier 2 Optimiser
 Python/optimizer.c            @markshannon @Fidget-Spinner
-Python/optimizer_analysis.c   @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
-Python/optimizer_bytecodes.c  @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
-Python/optimizer_symbols.c    @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski
+Python/optimizer_analysis.c   @markshannon @tomasr8 @Fidget-Spinner
+Python/optimizer_bytecodes.c  @markshannon @tomasr8 @Fidget-Spinner
+Python/optimizer_symbols.c    @markshannon @tomasr8 @Fidget-Spinner
 
 # Parser, Lexer, and Grammar
 Grammar/python.gram           @pablogsal @lysnikolaou
+Grammar/invalid.gram          @pablogsal @lysnikolaou
 Lib/test/test_peg_generator/  @pablogsal @lysnikolaou
 Lib/test/test_tokenize.py     @pablogsal @lysnikolaou
 Lib/tokenize.py               @pablogsal @lysnikolaou
@@ -432,6 +432,7 @@ Lib/test/test_*time.py           @pganssle @StanFromIreland
 Modules/*zoneinfo*               @pganssle @StanFromIreland
 Modules/*time*                   @pganssle @StanFromIreland
 Python/pytime.c                  @pganssle @StanFromIreland
+Python/_strptime.c               @pganssle @StanFromIreland
 
 # Dbm
 Doc/library/dbm.rst           @corona10 @erlend-aasland @serhiy-storchaka

.github/VULNERABILITY_REPORT.yml

@@ -51,8 +51,6 @@ body:
         - "3.15"
         - "3.16"
         - "CPython main branch"
-    validations:
-      required: true
   - type: textarea
     id: patch
     attributes:

.github/workflows/jit.yml

@@ -87,24 +87,16 @@ jobs:
           ./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
 
   macos:
-    name: ${{ matrix.target }} (${{ matrix.debug && 'Debug' || 'Release' }})
+    name: aarch64-apple-darwin/clang (${{ matrix.debug && 'Debug' || 'Release' }})
 
-    runs-on: ${{ matrix.runner }}
+    runs-on: macos-26
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
-        target:
-          - x86_64-apple-darwin/clang
-          - aarch64-apple-darwin/clang
         debug:
           - true
           - false
-        include:
-          - target: x86_64-apple-darwin/clang
-            runner: macos-26-intel
-          - target: aarch64-apple-darwin/clang
-            runner: macos-26
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:

.github/workflows/reusable-emscripten.yml

@@ -79,3 +79,5 @@ jobs:
       run: python3 Platforms/emscripten run --test
     - name: "Test Repl"
       run: Platforms/emscripten/browser_test/run_test.sh
+    - name: "Test embedding"
+      run: Platforms/emscripten/web_embed_test/run_test.sh

.github/workflows/reusable-test-lazy-imports-all.yml

@@ -64,6 +64,8 @@ jobs:
     - name: Verify excluded tests still need exclusion
       run: |
         set -euo pipefail
+        # Failures are expected here, don't report them to the job summary
+        unset GITHUB_STEP_SUMMARY
         unexpected_passes=()
         while IFS= read -r test_name; do
           [ -n "$test_name" ] || continue

.github/workflows/reusable-wasi.yml

@@ -16,7 +16,6 @@ jobs:
     timeout-minutes: 60
     env:
       WASMTIME_VERSION: 48.0.2
-      CROSS_BUILD_WASI: cross-build/wasm32-wasip1
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
@@ -65,4 +64,6 @@ jobs:
     - name: "Display build info of the host/WASI Python"
       run: python3 Platforms/WASI pythoninfo-host
     - name: "Test"
-      run: make --directory "${CROSS_BUILD_WASI}" test
+      run: |
+        CROSS_BUILD_WASI=$(python3 Platforms/WASI path)
+        make --directory "${CROSS_BUILD_WASI}" test

.github/workflows/tail-call.yml

@@ -24,17 +24,9 @@ env:
 
 jobs:
   macos:
-    name: ${{ matrix.target }}
-    runs-on: ${{ matrix.runner }}
+    name: aarch64-apple-darwin/clang
+    runs-on: macos-26
     timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - target: x86_64-apple-darwin/clang
-            runner: macos-26-intel
-          - target: aarch64-apple-darwin/clang
-            runner: macos-26
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
@@ -49,7 +41,6 @@ jobs:
       - name: Build
         run: |
           export SDKROOT="$(xcrun --show-sdk-path)"
-          export PATH="/usr/local/opt/llvm@${{ env.LLVM_VERSION }}/bin:$PATH"
           export PATH="/opt/homebrew/opt/llvm@${{ env.LLVM_VERSION }}/bin:$PATH"
           CC=clang-${{ env.LLVM_VERSION }} ./configure --with-tail-call-interp
           make all --jobs 4

.gitignore

@@ -72,16 +72,19 @@ Lib/test/data/*
 /_bootstrap_python
 /Makefile
 /Makefile.pre
-/iOSTestbed.*
-Apple/iOS/Frameworks/
-Apple/iOS/Resources/Info.plist
-Apple/testbed/build
+/AppleTestbed.*
+Platforms/Apple/iOS/Frameworks/*
+Platforms/Apple/iOS/Resources/Info.plist
 Platforms/Apple/testbed/Python*.xcframework/*/bin
 Platforms/Apple/testbed/Python*.xcframework/*/include
 Platforms/Apple/testbed/Python*.xcframework/*/lib
 Platforms/Apple/testbed/Python*.xcframework/*/Python*.framework
-Apple/testbed/*Testbed.xcodeproj/project.xcworkspace
-Apple/testbed/*Testbed.xcodeproj/xcuserdata
+Platforms/Apple/tvOS/Frameworks/*
+Platforms/Apple/tvOS/Resources/Info.plist
+Platforms/Apple/visionOS/Frameworks/*
+Platforms/Apple/visionOS/Resources/Info.plist
+Platforms/Apple/watchOS/Frameworks/*
+Platforms/Apple/watchOS/Resources/Info.plist
 Mac/Makefile
 Mac/PythonLauncher/Info.plist
 Mac/PythonLauncher/Makefile
@@ -99,6 +102,7 @@ Modules/Setup.config
 Modules/Setup.local
 Modules/Setup.stdlib
 Modules/config.c
+Modules/config_bootstrap.c
 Modules/ld_so_aix
 Programs/_freeze_module
 Programs/_testembed
@@ -180,6 +184,7 @@ Python/frozen_modules/MANIFEST
 
 # Local AI agent scratch state (per-PR and per-branch notebooks, sandbox
 # experiments) and personal agent overrides, none of which are committed.
+/do-not-commit/
 /.claude/pr-*
 /.claude/branch-*
 /.claude/sandbox/

Doc/README.rst

@@ -21,6 +21,7 @@ tree but are maintained separately and are available from
 * `Sphinx <https://pypi.org/project/Sphinx/>`_
 * `blurb <https://pypi.org/project/blurb/>`_
 * `python-docs-theme <https://pypi.org/project/python-docs-theme/>`_
+* `sphinx-linklint <https://pypi.org/project/sphinx-linklint/>`_
 
 The easiest way to install these tools is to create a virtual environment and
 install the tools into there.
@@ -57,6 +58,8 @@ Available make targets are:
 * "venv", which creates a virtual environment with all necessary tools
   installed.
 
+* "lock", which regenerates the pinned dependencies in ``pylock.toml``.
+
 * "html", which builds standalone HTML files for offline viewing.
 
 * "htmlview", which re-uses the "html" builder, but then opens the main page
@@ -79,6 +82,9 @@ Available make targets are:
 
 * "text", which builds a plain text file for each source file.
 
+* "texinfo", which builds Texinfo source files as input to ``makeinfo`` to
+  produce Info documents.
+
 * "epub", which builds an EPUB document, suitable to be viewed on e-book
   readers.
 
@@ -97,6 +103,10 @@ Available make targets are:
   plain text documentation for the labels defined in
   ``tools/pyspecific.py`` -- pydoc needs these to show topic and keyword help.
 
+* "doctest", which runs doctests in the documentation.
+
+* "gettext", which generates gettext message catalog templates.
+
 * "check", which checks for frequent markup errors.
 
 * "dist", (Unix only) which creates distributable archives of HTML, text,