[pull] main from python:main

.github/CODEOWNERS

@@ -176,9 +176,9 @@ Tools/wasm/config.site-wasm32-emscripten  @freakboy3742 @emmatyping
 Tools/wasm/emscripten                     @freakboy3742 @emmatyping
 
 # WebAssembly (WASI)
-Tools/wasm/wasi-env           @brettcannon @emmatyping
-Tools/wasm/wasi.py            @brettcannon @emmatyping
-Tools/wasm/wasi               @brettcannon @emmatyping
+Tools/wasm/wasi-env           @brettcannon @emmatyping @savannahostrowski
+Tools/wasm/wasi.py            @brettcannon @emmatyping @savannahostrowski
+Tools/wasm/wasi               @brettcannon @emmatyping @savannahostrowski
 
 # Windows
 PC/                           @python/windows-team

Doc/library/base64.rst

@@ -68,7 +68,7 @@ POST request.
    May assert or raise a :exc:`ValueError` if the length of *altchars* is not 2.  Raises a
    :exc:`TypeError` if *altchars* is not a :term:`bytes-like object`.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Added the *wrapcol* parameter.
 
 
@@ -285,7 +285,7 @@ Refer to the documentation of the individual functions for more information.
 
    .. versionadded:: 3.13
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       The *pad* parameter was added.
 
 

Doc/library/binascii.rst

@@ -82,7 +82,7 @@ The :mod:`binascii` module defines the following functions:
    .. versionchanged:: 3.6
       Added the *newline* parameter.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Added the *wrapcol* parameter.
 
 

Doc/library/mmap.rst

@@ -241,7 +241,7 @@ To map anonymous memory, -1 should be passed as the fileno along with the length
          specified alone, and the flush operation will extend from *offset*
          to the end of the mmap.
 
-      .. versionchanged:: next
+      .. versionchanged:: 3.15
          Added *flags* parameter to control synchronization behavior.
 
 
@@ -488,4 +488,4 @@ MS_* Constants
     * :data:`MS_INVALIDATE` - Invalidate cached data: invalidates other mappings
       of the same file so they can see the changes.
 
-    .. versionadded:: next
+    .. versionadded:: 3.15

Doc/library/os.rst

@@ -1562,7 +1562,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
 
    .. availability:: Linux >= 6.11
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 
 .. function:: ptsname(fd, /)

Doc/library/unicodedata.rst

@@ -188,22 +188,22 @@ following functions:
 
    Returns the Grapheme_Cluster_Break property assigned to the character.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 
 .. function:: indic_conjunct_break(chr, /)
 
    Returns the Indic_Conjunct_Break property assigned to the character.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 
 .. function:: extended_pictographic(chr, /)
 
    Returns ``True`` if the character has the Extended_Pictographic property,
    ``False`` otherwise.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 
 .. function:: normalize(form, unistr, /)
@@ -262,7 +262,7 @@ following functions:
    Standard Annex #29, `"Unicode Text Segmentation"
    <https://www.unicode.org/reports/tr29/>`_.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 
 In addition, the module exposes the following constant:

Include/patchlevel.h

@@ -24,10 +24,10 @@
 #define PY_MINOR_VERSION        15
 #define PY_MICRO_VERSION        0
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL       4
+#define PY_RELEASE_SERIAL       5
 
 /* Version as a string */
-#define PY_VERSION              "3.15.0a4+"
+#define PY_VERSION              "3.15.0a5+"
 /*--end constants--*/
 
 

Lib/functools.py

@@ -517,7 +517,7 @@ def _unwrap_partialmethod(func):
 ### LRU Cache function decorator
 ################################################################################
 
-_CacheInfo = namedtuple("CacheInfo", ["hits", "misses", "maxsize", "currsize"])
+_CacheInfo = namedtuple("CacheInfo", ("hits", "misses", "maxsize", "currsize"))
 
 def _make_key(args, kwds, typed,
              kwd_mark = (object(),),
@@ -539,13 +539,15 @@ def _make_key(args, kwds, typed,
     # distinct call from f(y=2, x=1) which will be cached separately.
     key = args
     if kwds:
+        key = list(key)
         key += kwd_mark
         for item in kwds.items():
             key += item
+        key = tuple(key)
     if typed:
-        key += tuple(type(v) for v in args)
+        key += tuple([type(v) for v in args])
         if kwds:
-            key += tuple(type(v) for v in kwds.values())
+            key += tuple([type(v) for v in kwds.values()])
     elif len(key) == 1 and type(key[0]) in fasttypes:
         return key[0]
     return key