Merge remote-tracking branch 'upstream/main' into gh-159244-dict-pair-race

# Conflicts:
#	Lib/test/test_free_threading/test_dict.py

Author: christianaurichzm

.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

.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/dependabot.yml

@@ -28,6 +28,17 @@ updates:
     cooldown:
       default-days: 14
 
+  - package-ecosystem: "npm"
+    directory: "/Platforms/emscripten/browser_test/"
+    schedule:
+      interval: "quarterly"
+    labels: ["OS-emscripten", "skip issue", "skip news"]
+    groups:
+      npm:
+        patterns: ["*"]
+    cooldown:
+      default-days: 14
+
   # Release branches: Dependabot only reads this file from the default
   # branch, so each branch that should get its own actions bumps needs an
   # entry here with `target-branch`. Add one when a new release branch is
@@ -118,14 +129,28 @@ updates:
     cooldown:
       default-days: 14
 
-  - package-ecosystem: "pip"
-    target-branch: "3.13"
-    directory: "/Tools/"
+  # Only bump bugfix branches for npm. Remove
+  # the entry when branch goes security-only.
+  - package-ecosystem: "npm"
+    target-branch: "3.15"
+    directory: "/Platforms/emscripten/browser_test/"
     schedule:
       interval: "quarterly"
-    labels: ["skip issue", "skip news"]
+    labels: ["OS-emscripten", "skip issue", "skip news"]
     groups:
-      pip:
+      npm:
+        patterns: ["*"]
+    cooldown:
+      default-days: 14
+
+  - package-ecosystem: "npm"
+    target-branch: "3.14"
+    directory: "/Platforms/emscripten/browser_test/"
+    schedule:
+      interval: "quarterly"
+    labels: ["OS-emscripten", "skip issue", "skip news"]
+    groups:
+      npm:
         patterns: ["*"]
     cooldown:
       default-days: 14

.github/workflows/build.yml

@@ -346,18 +346,28 @@ jobs:
         run: python3 Platforms/Android ci --fast-ci ${{ matrix.arch }}-linux-android
 
   build-ios:
-    name: iOS
+    name: >-
+      iOS
+      ${{ fromJSON(matrix.free-threading) && '(free-threading)' || '' }}
     needs: build-context
     if: needs.build-context.outputs.run-ios == 'true'
     timeout-minutes: 60
     runs-on: macos-26
+    strategy:
+      fail-fast: false
+      matrix:
+        free-threading:
+        - false
+        - true
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
 
       - name: Build and test
-        run: python3 Platforms/Apple ci iOS --fast-ci
+        run: >-
+          python3 Platforms/Apple ci iOS --fast-ci
+          ${{ fromJSON(matrix.free-threading) && '--abiflags t' || '' }}
 
   build-emscripten:
     name: 'Emscripten'
@@ -481,53 +491,6 @@ jobs:
     if: fromJSON(needs.build-context.outputs.run-tests)
     uses: ./.github/workflows/reusable-test-lazy-imports-all.yml
 
-  build-asan:
-    name: 'Address sanitizer'
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    needs: build-context
-    if: needs.build-context.outputs.run-ubuntu == 'true'
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-26.04]
-    env:
-      OPENSSL_VER: 3.5.9
-      PYTHONSTRICTEXTENSIONBUILD: 1
-      ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
-    steps:
-    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      with:
-        persist-credentials: false
-    - name: Runner image version
-      run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
-    - name: Register gcc problem matcher
-      run: echo "::add-matcher::.github/problem-matchers/gcc.json"
-    - name: Install dependencies
-      run: sudo ./.github/workflows/posix-deps-apt.sh
-    - name: Configure OpenSSL env vars
-      run: |
-        echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"
-        echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> "$GITHUB_ENV"
-        echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> "$GITHUB_ENV"
-    - name: 'Restore OpenSSL build'
-      id: cache-openssl
-      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-      with:
-        path: ./multissl/openssl/${{ env.OPENSSL_VER }}
-        key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
-    - name: Install OpenSSL
-      if: steps.cache-openssl.outputs.cache-hit != 'true'
-      run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
-    - name: Configure CPython
-      run: ./configure --config-cache --with-address-sanitizer --without-pymalloc --with-openssl="$OPENSSL_DIR"
-    - name: Build CPython
-      run: make -j4
-    - name: Display build info
-      run: make pythoninfo
-    - name: Tests
-      run: xvfb-run make ci
-
   build-san:
     # ${{ '' } is a hack to nest jobs under the same sidebar category.
     name: Sanitizers${{ '' }}  # zizmor: ignore[obfuscation]
@@ -544,6 +507,9 @@ jobs:
         sanitizer:
         - TSan
         include:
+        - check-name: Address
+          sanitizer: ASan
+          free-threading: false
         - check-name: Undefined behavior
           sanitizer: UBSan
           free-threading: false
@@ -657,7 +623,6 @@ jobs:
     - build-wasi
     - test-hypothesis
     - test-lazy-imports-all
-    - build-asan
     - build-san
     - cross-build-linux
     - cifuzz
@@ -704,7 +669,6 @@ jobs:
             build-ubuntu-installed,
             build-ubuntu-ssltests,
             test-hypothesis,
-            build-asan,
             build-san,
             cross-build-linux,
             '

.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-san.yml

@@ -43,6 +43,15 @@ jobs:
         # please update the versions in `Tools/pixi-packages/variants.yaml` too.
         echo "CC=clang" >> "$GITHUB_ENV"
         echo "CXX=clang++" >> "$GITHUB_ENV"
+    - name: ASan option setup
+      if: inputs.sanitizer == 'ASan'
+      run: |
+        echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"
+        echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> "$GITHUB_ENV"
+        echo "ASAN_OPTIONS=${SAN_LOG_OPTION} detect_leaks=0 allocator_may_return_null=1 handle_segv=0" >> "$GITHUB_ENV"
+        echo "PYTHONSTRICTEXTENSIONBUILD=1" >> "$GITHUB_ENV"
+      env:
+        SAN_LOG_OPTION: log_path=${{ github.workspace }}/san_log
     - name: TSan option setup
       if: inputs.sanitizer == 'TSan'
       run: |
@@ -88,24 +97,27 @@ jobs:
     - name: Add ccache to PATH
       run: |
         echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
-    - name: 'Restore OpenSSL build (TSan)'
+    - name: 'Restore OpenSSL build'
       id: cache-openssl
-      if: inputs.sanitizer == 'TSan'
+      if: inputs.sanitizer == 'TSan' || inputs.sanitizer == 'ASan'
       uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: ./multissl/openssl/${{ env.OPENSSL_VER }}
-        key: ${{ env.IMAGE_OS_VERSION }}-multissl-openssl-tsan-${{ env.OPENSSL_VER }}
-    - name: Install OpenSSL (TSan)
+        key: >-
+          ${{ env.IMAGE_OS_VERSION }}-multissl-openssl-${{
+            inputs.sanitizer == 'TSan' && 'tsan-' || ''
+          }}${{ env.OPENSSL_VER }}
+    - name: Install OpenSSL
       if: >-
-        inputs.sanitizer == 'TSan'
+        (inputs.sanitizer == 'TSan' || inputs.sanitizer == 'ASan')
         && steps.cache-openssl.outputs.cache-hit != 'true'
       run: >-
         python3 Tools/ssl/multissltests.py
         --steps=library
         --base-directory="${MULTISSL_DIR}"
         --openssl="${OPENSSL_VER}"
         --system=Linux
-        --tsan
+        ${{ inputs.sanitizer == 'TSan' && '--tsan' || '' }}
     # gh-157958: -O2 instead of the pydebug default -Og to avoid a clang 21
     # compile-time blowup on some interpreter files.
     # (https://github.com/llvm/llvm-project/issues/179695)
@@ -117,14 +129,20 @@ jobs:
         --config-cache
         OPT="-O2 -g"
         ${{
-          inputs.sanitizer == 'TSan'
+          inputs.sanitizer == 'ASan'
+          && '--with-address-sanitizer --without-pymalloc'
+          || inputs.sanitizer == 'TSan'
           && '--with-thread-sanitizer'
           || inputs.sanitizer == 'MSan'
           && '--with-memory-sanitizer'
           || '--with-undefined-behavior-sanitizer --with-strict-overflow'
         }}
         ${{ inputs.sanitizer == 'MSan' && '--with-assertions' || '--with-pydebug' }}
-        ${{ inputs.sanitizer == 'TSan' && '--with-openssl="$OPENSSL_DIR" --with-openssl-rpath=auto' || '' }}
+        ${{
+          (inputs.sanitizer == 'TSan' || inputs.sanitizer == 'ASan')
+          && '--with-openssl="$OPENSSL_DIR" --with-openssl-rpath=auto'
+          || ''
+        }}
         ${{ inputs.free-threading && '--disable-gil' || '' }}
     - name: Build CPython
       run: make -j4

.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

.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
-Apple/testbed/Python.xcframework/*/bin
-Apple/testbed/Python.xcframework/*/include
-Apple/testbed/Python.xcframework/*/lib
-Apple/testbed/Python.xcframework/*/Python.framework
-Apple/testbed/*Testbed.xcodeproj/project.xcworkspace
-Apple/testbed/*Testbed.xcodeproj/xcuserdata
+/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
+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
@@ -180,6 +183,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,