Merge branch 'main' into scanfix-tzpath-izmaolcq

Author: gpshead

.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-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-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
+/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/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,

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/library/argparse.rst

@@ -789,6 +789,9 @@ how the command-line arguments should be handled. The supplied actions are:
     >>> parser.parse_args('--foo --bar'.split())
     Namespace(foo=True, bar=False, baz=True)
 
+  These defaults apply when the options are absent. They can be overridden
+  by default_ or argument_default_.
+
 * ``'append'`` - This appends each argument value to a list.
   It is useful for allowing an option to be specified multiple times.
   If the default value is a non-empty list, the parsed value for the option
@@ -1016,10 +1019,8 @@ default
 
 All optional arguments and some positional arguments may be omitted at the
 command line.  The ``default`` keyword argument of
-:meth:`~ArgumentParser.add_argument`, whose value defaults to ``None``,
-specifies what value should be used if the command-line argument is not present.
-For optional arguments, the ``default`` value is used when the option string
-was not present at the command line::
+:meth:`~ArgumentParser.add_argument` specifies what value should be used if the
+command-line argument is not present. For example::
 
    >>> parser = argparse.ArgumentParser()
    >>> parser.add_argument('--foo', default=42)
@@ -1028,6 +1029,11 @@ was not present at the command line::
    >>> parser.parse_args([])
    Namespace(foo=42)
 
+If ``default`` is omitted, :meth:`~ArgumentParser.add_argument` uses a value
+previously set for the dest_ with :meth:`~ArgumentParser.set_defaults`, or
+otherwise a non-``None`` argument_default_. If neither is set, the action's
+own default is used.
+
 If the target namespace already has an attribute set, the action *default*
 will not overwrite it::
 

Doc/library/cmd.rst

@@ -13,6 +13,13 @@ command interpreters.  These are often useful for test harnesses, administrative
 tools, and prototypes that will later be wrapped in a more sophisticated
 interface.
 
+A command interpreter built with :class:`Cmd` typically presents the user
+with an interactive prompt, reads input one line at a time, and dispatches each
+command to a method named ``do_`` followed by the command name.  For example,
+the ``help`` command is handled by the :meth:`~Cmd.do_help` method.  Apart from
+the built-in ``help`` command, most of the interpreter's behavior is defined by
+the ``do_*`` methods you add in your own subclass.
+
 .. class:: Cmd(completekey='tab', stdin=None, stdout=None)
 
    A :class:`Cmd` instance or subclass instance is a line-oriented interpreter

Doc/library/ctypes.rst

@@ -1337,6 +1337,31 @@ write::
    :class:`threading.local` will *not* survive across different callbacks, even when
    those calls are made from the same C thread.
 
+Callback functions can return structures and unions by value, in addition to
+the simple types:
+
+.. code-block:: python
+
+   class Point(Structure):
+       _fields_ = [("x", c_int), ("y", c_int)]
+
+   @CFUNCTYPE(Point)
+   def get_origin():
+       return Point(0, 0)
+
+.. note::
+
+   A structure or union returned from a callback is copied *by value*, and
+   :mod:`!ctypes` does not keep the returned object alive after the callback
+   returns. If the structure contains a pointer field (such as
+   :class:`c_char_p` or a :func:`POINTER` type), you must ensure that the
+   memory it refers to stays valid for as long as the C code uses it -- the
+   same requirement C itself imposes. Returning a pointer to memory owned by
+   a temporary Python object will leave the C caller with a dangling pointer.
+
+.. versionchanged:: next
+   Callback functions can now return structures and unions.
+
 .. _ctypes-accessing-values-exported-from-dlls:
 
 Accessing values exported from dlls

Doc/library/curses.rst

@@ -274,9 +274,11 @@ Input options
 
    Used for half-delay mode, which is similar to cbreak mode in that characters
    typed by the user are immediately available to the program. However, after
-   blocking for *tenths* tenths of seconds, raise an exception if nothing has
-   been typed.  The value of *tenths* must be a number between ``1`` and ``255``.  Use
-   :func:`nocbreak` to leave half-delay mode.
+   blocking for *tenths* tenths of seconds, if nothing has been typed,
+   :meth:`~window.getch` returns ``-1``, while :meth:`~window.getkey` and
+   :meth:`~window.get_wch` raise :exc:`curses.error`.
+   The value of *tenths* must be a number between ``1`` and ``255``.
+   Use :func:`nocbreak` to leave half-delay mode.
 
 .. function:: meta(flag)
 
@@ -893,8 +895,10 @@ Querying the terminal
 
 .. function:: termname()
 
-   Return the value of the environment variable :envvar:`TERM`, as a bytes object,
-   truncated to 14 characters.
+   Return the name of the terminal in use, as a bytes object.
+   This is the name passed to :func:`newterm` or
+   :func:`setupterm`, or the value of the :envvar:`TERM` environment variable
+   if none was given.  Some curses libraries truncate it to 14 characters.
 
 .. function:: longname()
 
@@ -1227,7 +1231,8 @@ Adding and inserting text
    Insert character *ch* with attributes *attr* before the character under the
    cursor, or at ``(y, x)`` if specified.  All characters to the right of the
    cursor are shifted one position right, with the rightmost character on the
-   line being lost.  The cursor position does not change.
+   line being lost.
+   The cursor position does not change (after moving to *y*, *x*, if specified).
 
    .. versionchanged:: 3.16
       Wide and combining characters, and :class:`complexchar` cells, are now
@@ -1251,8 +1256,8 @@ Adding and inserting text
             window.insnstr(y, x, str, n[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
-   the character under the cursor, up to *n* characters.   If *n* is zero or
-   negative, the entire string is inserted. All characters to the right of the
+   the character under the cursor, up to *n* characters.   If *n* is negative,
+   the entire string is inserted. All characters to the right of the
    cursor are shifted right, with the rightmost characters on the line being lost.
    The cursor position does not change (after moving to *y*, *x*, if specified).
 
@@ -1871,8 +1876,9 @@ Output options
 .. method:: window.scroll([lines=1])
 
    Scroll the screen or scrolling region.  Scroll upward by *lines* lines if
-   *lines* is positive, or downward if it is negative.  Scrolling has no effect
-   unless it has been enabled for the window with :meth:`scrollok`.
+   *lines* is positive, or downward if it is negative.
+   Raise :exc:`curses.error` unless scrolling has been enabled for the window
+   with :meth:`scrollok`.
 
 .. method:: window.setscrreg(top, bottom)