Merge branch '3.13' of https://github.com/python/cpython into 3.13

Author: lpyu001

.github/workflows/build.yml

@@ -303,7 +303,7 @@ jobs:
         # Keep 1.1.1w in our list despite it being upstream EOL and otherwise
         # unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
         # supported by important vendors such as AWS-LC.
-        openssl_ver: [1.1.1w, 3.0.21, 3.4.6, 3.5.7, 3.6.3]
+        openssl_ver: [1.1.1w, 3.0.22, 3.4.7, 3.5.8, 3.6.4]
         # See Tools/ssl/make_ssl_data.py for notes on adding a new version
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
@@ -378,7 +378,7 @@ jobs:
     needs: build-context
     if: needs.build-context.outputs.run-ubuntu == 'true'
     env:
-      OPENSSL_VER: 3.0.21
+      OPENSSL_VER: 3.0.22
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -485,7 +485,7 @@ jobs:
       matrix:
         os: [ubuntu-24.04]
     env:
-      OPENSSL_VER: 3.0.21
+      OPENSSL_VER: 3.0.22
       PYTHONSTRICTEXTENSIONBUILD: 1
       ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
     steps:

.github/workflows/reusable-ubuntu.yml

@@ -25,7 +25,7 @@ jobs:
       matrix:
         os: [ubuntu-24.04, ubuntu-24.04-arm]
     env:
-      OPENSSL_VER: 3.0.21
+      OPENSSL_VER: 3.0.22
       PYTHONSTRICTEXTENSIONBUILD: 1
       TERM: linux
     steps:

Android/android.py

@@ -221,7 +221,7 @@ def unpack_deps(host, prefix_dir, cache_dir):
     for name_ver in [
         "bzip2-1.0.8-3",
         "libffi-3.4.4-3",
-        "openssl-3.0.21-0",
+        "openssl-3.0.22-0",
         "sqlite-3.50.4-0",
         "xz-5.4.6-1"
     ]:

Doc/conf.py

@@ -39,7 +39,7 @@
 
 # Skip if downstream redistributors haven't installed them
 _OPTIONAL_EXTENSIONS = (
-    'linklint.ext',
+    'sphinx_linklint.ext',
     'notfound.extension',
     'sphinxext.opengraph',
 )

Doc/glossary.rst

@@ -470,7 +470,7 @@ Glossary
       A piece of syntax which can be evaluated to some value.  In other words,
       an expression is an accumulation of expression elements like literals,
       names, attribute access, operators or function calls which all return a
-      value.  In contrast to many other languages, not all language constructs
+      value.  Not all language constructs
       are expressions.  There are also :term:`statement`\s which cannot be used
       as expressions, such as :keyword:`while`.  Assignments are also statements,
       not expressions.

Doc/library/asyncio-stream.rst

@@ -49,7 +49,7 @@ and work with streams:
 
 
 .. function:: open_connection(host=None, port=None, *, \
-                 limit=None, ssl=None, family=0, proto=0, \
+                 limit=65536, ssl=None, family=0, proto=0, \
                  flags=0, sock=None, local_addr=None, \
                  server_hostname=None, ssl_handshake_timeout=None, \
                  ssl_shutdown_timeout=None, \
@@ -89,7 +89,7 @@ and work with streams:
 
 
 .. function:: start_server(client_connected_cb, host=None, \
-                 port=None, *, limit=None, \
+                 port=None, *, limit=65536, \
                  family=socket.AF_UNSPEC, \
                  flags=socket.AI_PASSIVE, sock=None, \
                  backlog=100, ssl=None, reuse_address=None, \
@@ -137,7 +137,7 @@ and work with streams:
 
 .. rubric:: Unix Sockets
 
-.. function:: open_unix_connection(path=None, *, limit=None, \
+.. function:: open_unix_connection(path=None, *, limit=65536, \
                ssl=None, sock=None, server_hostname=None, \
                ssl_handshake_timeout=None, ssl_shutdown_timeout=None)
    :async:
@@ -169,7 +169,7 @@ and work with streams:
 
 
 .. function:: start_unix_server(client_connected_cb, path=None, \
-                 *, limit=None, sock=None, backlog=100, ssl=None, \
+                 *, limit=65536, sock=None, backlog=100, ssl=None, \
                  ssl_handshake_timeout=None, \
                  ssl_shutdown_timeout=None, start_serving=True, cleanup_socket=True)
    :async:

Doc/library/asyncio-subprocess.rst

@@ -62,7 +62,7 @@ Creating Subprocesses
 =====================
 
 .. function:: create_subprocess_exec(program, *args, stdin=None, \
-                 stdout=None, stderr=None, limit=None, **kwds)
+                 stdout=None, stderr=None, limit=65536, **kwds)
    :async:
 
    Create a subprocess.
@@ -84,7 +84,7 @@ Creating Subprocesses
 
 
 .. function:: create_subprocess_shell(cmd, stdin=None, \
-                 stdout=None, stderr=None, limit=None, **kwds)
+                 stdout=None, stderr=None, limit=65536, **kwds)
    :async:
 
    Run the *cmd* shell command.

Doc/library/curses.rst

@@ -28,6 +28,8 @@ Linux and the BSD variants of Unix.
 
    Whenever the documentation mentions a *character* it can be specified
    as an integer, a one-character Unicode string or a one-byte byte string.
+   An integer is the code of a single encoded byte, optionally combined with
+   attributes and a color pair, as returned by :meth:`window.inch`.
 
    Whenever the documentation mentions a *character string* it can be specified
    as a Unicode string or a byte string.
@@ -484,8 +486,8 @@ The module :mod:`curses` defines the following functions:
 .. function:: putp(str)
 
    Equivalent to ``tputs(str, 1, putchar)``; emit the value of a specified
-   terminfo capability for the current terminal.  Note that the output of :func:`putp`
-   always goes to standard output.
+   terminfo capability, a bytes object, for the current terminal.
+   Note that the output of :func:`putp` always goes to standard output.
 
    :func:`setupterm` (or :func:`initscr`) must be called first.
 
@@ -656,7 +658,7 @@ The module :mod:`curses` defines the following functions:
 .. function:: tparm(str[, ...])
 
    Instantiate the bytes object *str* with the supplied parameters, where *str* should
-   be a parameterized string obtained from the terminfo database.  For example,
+   be a parameterized byte string obtained from the terminfo database.  For example,
    ``tparm(tigetstr("cup"), 5, 3)`` could result in ``b'\033[6;4H'``, the exact
    result depending on terminal type.  Up to nine integer parameters may be supplied.
 
@@ -677,7 +679,8 @@ The module :mod:`curses` defines the following functions:
 
 .. function:: unctrl(ch)
 
-   Return a bytes object which is a printable representation of the character *ch*.
+   Return a bytes object which is a printable representation of the character *ch*;
+   any attributes and color pair are ignored.
    Control characters are represented as a caret followed by the character, for
    example as ``b'^C'``. Printing characters are left as they are.
 
@@ -686,6 +689,9 @@ The module :mod:`curses` defines the following functions:
 
    Push *ch* so the next :meth:`~window.getch` will return it.
 
+   *ch* may be an integer (a key code or the code of an encoded byte), a byte,
+   or a string of length 1 which encodes to a single byte.
+
    .. note::
 
       Only one *ch* can be pushed before :meth:`!getch` is called.
@@ -703,6 +709,9 @@ The module :mod:`curses` defines the following functions:
 
    Push *ch* so the next :meth:`~window.get_wch` will return it.
 
+   *ch* may be an integer (a character code, not a key code) or a string of
+   length 1.
+
    .. note::
 
       Only one *ch* can be pushed before :meth:`!get_wch` is called.
@@ -988,27 +997,58 @@ Window objects
 
 .. method:: window.getch([y, x])
 
-   Get a character. Note that the integer returned does *not* have to be in ASCII
-   range: function keys, keypad keys and so on are represented by numbers higher
-   than 255.  In no-delay mode, return ``-1`` if there is no input, otherwise
-   wait until a key is pressed.
+   Read a key press, after moving the cursor to *y*, *x* if specified,
+   and return it as an integer.
+   The window is refreshed first if it is not a pad and was modified since
+   the last refresh.
+   Wait until a key is pressed, or return ``-1`` if the read is non-blocking
+   or times out (see :meth:`nodelay` and :meth:`timeout`).
+
+   An ordinary key is returned as the code of a single byte of its encoding
+   in the current locale,
+   so a character encoded with several bytes takes several calls.
+   For example, in a UTF-8 locale ``'é'`` is read as ``195``, then ``169``.
+   Use :meth:`get_wch` to read it as a single character.
+
+   In keypad mode (see :meth:`keypad`) function keys and other special keys
+   are returned as one of the :ref:`KEY_* constants <curses-key-constants>`,
+   which cannot be mistaken for an ordinary key.
+   Otherwise, or if their escape sequence does not arrive in time
+   (see :meth:`notimeout` and :func:`set_escdelay`),
+   their bytes are returned one at a time.
+
+   In echo mode (see :func:`echo`) the key is added to the window as by
+   :meth:`addch`; special keys are not echoed.
 
 
 .. method:: window.get_wch([y, x])
 
-   Get a wide character. Return a character for most keys, or an integer for
-   function keys, keypad keys, and other special keys.
-   In no-delay mode, raise an exception if there is no input.
+   Read a key press, after moving the cursor to *y*, *x* if specified,
+   and return it as a one-character :class:`str`.
+   The window is refreshed first if it is not a pad and was modified since
+   the last refresh.
+   Wait until a key is pressed, or raise :exc:`error` if the read is
+   non-blocking or times out (see :meth:`nodelay` and :meth:`timeout`).
+
+   In keypad mode (see :meth:`keypad`) function keys and other special keys
+   are returned as one of the :ref:`KEY_* constants <curses-key-constants>`,
+   an integer.
+   Otherwise, or if their escape sequence does not arrive in time
+   (see :meth:`notimeout` and :func:`set_escdelay`),
+   their characters are returned one at a time.
+
+   In echo mode (see :func:`echo`) the key is added to the window as by
+   :meth:`addch`; special keys are not echoed.
 
    .. versionadded:: 3.3
 
 
 .. method:: window.getkey([y, x])
 
-   Get a character, returning a string instead of an integer, as :meth:`getch`
-   does. Function keys, keypad keys and other special keys return a multibyte
-   string containing the key name.  In no-delay mode, raise an exception if
-   there is no input.
+   Read a key press as :meth:`getch` does, but return it as a :class:`str`:
+   an ordinary key as a one-character string, the byte decoded as Latin-1,
+   and a special key as its name, such as ``'KEY_UP'`` (see :func:`keyname`).
+   Raise :exc:`error` instead of returning ``-1`` if there is no input.
 
 
 .. method:: window.getmaxyx()
@@ -1028,9 +1068,12 @@ Window objects
             window.getstr(y, x)
             window.getstr(y, x, n)
 
-   Read a bytes object from the user, with primitive line editing capacity.
-   At most *n* characters are read (1023 by default).
-   The maximum value for *n* is 1023.
+   Read a line of input from the user, with primitive line editing capacity,
+   after moving the cursor to *y*, *x* if specified.
+   Return it as a bytes object, in the encoding of the current locale
+   and without the terminating newline.
+   At most *n* bytes are read;
+   *n* defaults to and cannot exceed 1023.
 
 
 .. method:: window.getyx()
@@ -1128,11 +1171,11 @@ Window objects
 .. method:: window.instr([n])
             window.instr(y, x[, n])
 
-   Return a bytes object of characters, extracted from the window starting at the
-   current cursor position, or at *y*, *x* if specified, and stopping at the end
-   of the line. Attributes and color information are stripped
-   from the characters.  If *n* is specified, :meth:`instr` returns a string
-   at most *n* characters long (exclusive of the trailing NUL).
+   Read the text of the window from the current cursor position,
+   or from *y*, *x* if specified, to the end of the line,
+   and return it as a bytes object, in the encoding of the current locale.
+   Attributes and color pairs are stripped.
+   At most *n* bytes are read; *n* defaults to and cannot exceed 1023.
 
 
 .. method:: window.is_linetouched(line)
@@ -1153,6 +1196,8 @@ Window objects
    If *flag* is ``True``, escape sequences generated by some keys (keypad,  function keys)
    will be interpreted by :mod:`curses`. If *flag* is ``False``, escape sequences will be
    left as is in the input stream.
+   Keypad mode is disabled by default, but :func:`wrapper` enables it for the
+   main window.
 
 
 .. method:: window.leaveok(flag)
@@ -1505,6 +1550,8 @@ by some methods.
 |                         | color-pair field information  |
 +-------------------------+-------------------------------+
 
+.. _curses-key-constants:
+
 Keys are referred to by integer constants with names starting with  ``KEY_``.
 The exact keycaps available are system dependent.
 

Doc/library/difflib.rst

@@ -21,7 +21,7 @@ This module provides classes and functions for comparing sequences.
 Most of them compare sequences of text lines (for example lists of strings,
 or :term:`file objects <file object>`) and
 produce :dfn:`diffs` -- reports on the differences.
-Diffs can be produced in in various formats, including HTML and context
+Diffs can be produced in various formats, including HTML and context
 and unified diffs -- formats produced by tools like
 :manpage:`diff <diff(1)>` and :manpage:`git diff <git-diff(1)>`.
 
@@ -56,7 +56,7 @@ By default, if the second input sequence is at least 200 items long, items
 that account for more than 1% it are considered *junk*.
 
 Depending on your data, you should consider turning this heuristic off
-(setting :class:`~difflib.SequenceMatcher`'s *autojunk* argument to  to ``False``)
+(setting :class:`~difflib.SequenceMatcher`'s *autojunk* argument to ``False``)
 or tuning it (using the *isjunk* argument, perhaps to one of the
 :ref:`predefined functions <difflib-isjunk-functions>`).
 

Doc/library/tempfile.rst

@@ -321,8 +321,11 @@ The module defines the following user-callable items:
 
    #. A platform-specific location:
 
-      * On Windows, the directories :file:`C:\\TEMP`, :file:`C:\\TMP`,
-        :file:`\\TEMP`, and :file:`\\TMP`, in that order.
+      * On Windows, the directories
+        :file:`%USERPROFILE%\\AppData\\Local\\Temp`,
+        :file:`%SYSTEMROOT%\\Temp`, :file:`C:\\TEMP`,
+        :file:`C:\\TMP`, :file:`\\TEMP`, and
+        :file:`\\TMP`, in that order.
 
       * On all other platforms, the directories :file:`/tmp`, :file:`/var/tmp`, and
         :file:`/usr/tmp`, in that order.