Merge branch 'main' into fix-forkserver-sigkill-race

Author: gpshead

.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

@@ -302,6 +302,7 @@ 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/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

.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

Doc/builtins/functions.rst

@@ -354,6 +354,10 @@ are always available.  They are listed here in alphabetical order.
    consists of a single expression, or ``'single'`` if it consists of a single
    interactive statement (in the latter case, expression statements that
    evaluate to something other than ``None`` will be printed).
+   It can also be ``'func_type'`` if *source* consists of a
+   function type signature, for example ``(int) -> str``; see
+   :func:`ast.parse` for more information. This mode requires passing
+   :data:`ast.PyCF_ONLY_AST` in *flags*.
 
    The optional arguments *flags* and *dont_inherit* control which
    :ref:`compiler options <ast-compiler-flags>` should be activated
@@ -427,6 +431,9 @@ are always available.  They are listed here in alphabetical order.
       ``ast.PyCF_ALLOW_TOP_LEVEL_AWAIT`` can now be passed in flags to enable
       support for top-level ``await``, ``async for``, and ``async with``.
 
+   .. versionchanged:: 3.8
+      Added support for ``mode='func_type'``.
+
    .. versionchanged:: 3.12
       :exc:`SyntaxError` is raised instead of :exc:`ValueError` when null bytes
       are encountered in *source*.

Doc/c-api/code.rst

@@ -94,11 +94,12 @@ bound into a function.
 
 .. c:function:: int PyCode_Addr2Line(PyCodeObject *co, int byte_offset)
 
-    Return the line number of the instruction that occurs on or before ``byte_offset`` and ends after it.
-    If you just need the line number of a frame, use :c:func:`PyFrame_GetLineNumber` instead.
+    Return the line number of the instruction that occurs on or before
+    ``byte_offset`` and ends after it.  This may be ``O(N)`` in the number of
+    instructions in the code object, so it is not performant for iterating over
+    all the line numbers in a code object.
 
-    For efficiently iterating over the line numbers in a code object, use :pep:`the API described in PEP 626
-    <0626#out-of-process-debuggers-and-profilers>`.
+    If you just need the line number of a frame, use :c:func:`PyFrame_GetLineNumber` instead.
 
 .. c:function:: int PyCode_Addr2Location(PyObject *co, int byte_offset, int *start_line, int *start_column, int *end_line, int *end_column)
 

Doc/conf.py

@@ -86,6 +86,13 @@
 .. |python_x_dot_y_literal| replace:: ``python{version}``
 .. |python_x_dot_y_t_literal| replace:: ``python{version}t``
 .. |python_x_dot_y_t_literal_config| replace:: ``python{version}t-config``
+.. |python_x_dot_y_exe_literal| replace:: ``python{version}.exe``
+.. |python_x_dot_y_t_exe_literal| replace:: ``python{version}t.exe``
+.. |python_xy_dll_literal| replace:: ``python{v.major}{v.minor}.dll``
+.. |py_v_x_dot_y_literal| replace:: ``py -V:{version}``
+.. |py_v_x_dot_y_t_literal| replace:: ``py -V:{version}t``
+.. |x_dot_y_literal| replace:: ``{version}``
+.. |x_dot_y_64_literal| replace:: ``{version}-64``
 .. |x_dot_y_b2_literal| replace:: ``{version}.0b2``
 .. |applications_python_version_literal| replace:: ``/Applications/Python {version}/``
 .. |usr_local_bin_python_x_dot_y_literal| replace:: ``/usr/local/bin/python{version}``

Doc/deprecations/pending-removal-in-3.19.rst

@@ -1,6 +1,13 @@
 Pending removal in Python 3.19
 ------------------------------
 
+* :mod:`builtins`:
+
+  * Passing a complex number as the *real* or *imag* argument in the
+    :func:`complex` constructor is now deprecated; it should only be passed
+    as a single positional argument.
+    (Contributed by Serhiy Storchaka in :gh:`109218`.)
+
 * :mod:`ctypes`:
 
   * Implicitly switching to the MSVC-compatible struct layout by setting

Doc/deprecations/pending-removal-in-future.rst

@@ -35,10 +35,6 @@ although there is currently no date scheduled for their removal.
   * Support for ``__complex__()`` method returning a strict subclass of
     :class:`complex`: these methods will be required to return an instance of
     :class:`complex`.
-  * Passing a complex number as the *real* or *imag* argument in the
-    :func:`complex` constructor is now deprecated; it should only be passed
-    as a single positional argument.
-    (Contributed by Serhiy Storchaka in :gh:`109218`.)
 
 * :mod:`calendar`: ``calendar.January`` and ``calendar.February`` constants are
   deprecated and replaced by :data:`calendar.JANUARY` and