Merge branch 'main' into tkinter-photoimage-redither

Author: serhiy-storchaka

Doc/deprecations/index.rst

@@ -1,8 +1,6 @@
 Deprecations
 ============
 
-.. include:: pending-removal-in-3.16.rst
-
 .. include:: pending-removal-in-3.17.rst
 
 .. include:: pending-removal-in-3.18.rst
@@ -20,8 +18,6 @@ Deprecations
 C API deprecations
 ------------------
 
-.. include:: c-api-pending-removal-in-3.16.rst
-
 .. include:: c-api-pending-removal-in-3.18.rst
 
 .. include:: c-api-pending-removal-in-3.19.rst

Doc/tools/removed-ids.txt

@@ -7,7 +7,9 @@ c-api/file.html: deprecated-api
 # Removed sections
 library/asyncio-task.html: terminating-a-task-group
 deprecations/index.html: pending-removal-in-python-3-15
+deprecations/index.html: pending-removal-in-python-3-16
 deprecations/index.html: c-api-pending-removal-in-python-3-15
+deprecations/index.html: c-api-pending-removal-in-python-3-16
 
 # Removed libmpdec
 using/configure.html: cmdoption-with-system-libmpdec

Doc/whatsnew/3.16.rst

@@ -99,14 +99,6 @@ gzip
   which is passed on to the constructor of the :class:`~gzip.GzipFile` class.
   (Contributed by Marin Misur in :gh:`91372`.)
 
-lzma
-----
-
-* Add support of new BCJ filters ARM64 and RISC-V via
-  :const:`!lzma.FILTER_ARM64` and :const:`!lzma.FILTER_RISCV`.  Note that the
-  new filters will work only if runtime library supports them. ARM64 filter
-  requires ``lzma`` 5.4.0 or newer while RISC-V requires 5.6.0 or newer.
-  (Contributed by Chien Wong in :gh:`115988`.)
 
 logging
 -------
@@ -119,6 +111,17 @@ logging
   before the rotation interval expires.
   (Contributed by Iván Márton and Serhiy Storchaka in :gh:`84649`.)
 
+
+lzma
+----
+
+* Add support of new BCJ filters ARM64 and RISC-V via
+  :const:`!lzma.FILTER_ARM64` and :const:`!lzma.FILTER_RISCV`.  Note that the
+  new filters will work only if the runtime library supports them. ARM64 filter
+  requires ``lzma`` 5.4.0 or newer while RISC-V requires 5.6.0 or newer.
+  (Contributed by Chien Wong in :gh:`115988`.)
+
+
 math
 ----
 
@@ -130,20 +133,23 @@ math
   754-2019 and standardized in C23.
   (Contributed by Jeff Epler in :gh:`150534`.)
 
+
 os
 --
 
 * Add :func:`os.pidfd_getfd` for duplicating a file descriptor from another
   process via a pidfd.  Available on Linux 5.6+.
   (Contributed by Maurycy Pawłowski-Wieroński in :gh:`149464`.)
 
+
 shlex
 -----
 
 * Add keyword-only parameter *force* to :func:`shlex.quote` to force quoting
   a string, even if it is already safe for a shell without being quoted.
   (Contributed by Jay Berry in :gh:`148846`.)
 
+
 tkinter
 -------
 
@@ -161,19 +167,20 @@ tkinter
   dithered image when its data was supplied in pieces.
   (Contributed by Serhiy Storchaka in :gh:`151888`.)
 
+
 xml
 ---
 
 * Add support for multiple multi-byte encodings in the :mod:`XML parser
-  <xml.parsers.expat>`: "cp932", "cp949", "cp950", "Big5","EUC-JP",
+  <xml.parsers.expat>`: "cp932", "cp949", "cp950", "Big5", "EUC-JP",
   "GB2312", "GBK", "johab", and "Shift_JIS".
   Add partial support (only BMP characters) for multi-byte encodings
   "Big5-HKSCS", "EUC_JIS-2004", "EUC_JISX0213", "Shift_JIS-2004",
   "Shift_JISX0213", "utf-8-sig" and non-standard aliases like "UTF8"
   (without hyphen).
   The parser now raises :exc:`ValueError` for known unsupported
-  multi-byte encodings such us "ISO-2022-JP" or "raw-unicode-escape"
-  instead of failing later, when encounter non-ASCII data.
+  multi-byte encodings such as "ISO-2022-JP" or "raw-unicode-escape"
+  instead of failing later, when encountering non-ASCII data.
   (Contributed by Serhiy Storchaka in :gh:`62259`.)
 
 zipfile
@@ -283,14 +290,17 @@ tarfile
 Deprecated
 ==========
 
+New deprecations
+----------------
+
 * :mod:`abc`
 
-   * Soft-deprecated since Python 3.3 :class:`abc.abstractclassmethod`,
-     :class:`abc.abstractstaticmethod`, and :class:`abc.abstractproperty`
-     now raise a :exc:`DeprecationWarning`.
-     These classes will be removed in Python 3.21, instead
-     use :func:`abc.abstractmethod` with :func:`classmethod`,
-     :func:`staticmethod`, and :class:`property` respectively.
+  * Soft-deprecated since Python 3.3 :class:`abc.abstractclassmethod`,
+    :class:`abc.abstractstaticmethod`, and :class:`abc.abstractproperty`
+    now raise a :exc:`DeprecationWarning`.
+    These classes will be removed in Python 3.21, instead
+    use :func:`abc.abstractmethod` with :func:`classmethod`,
+    :func:`staticmethod`, and :class:`property` respectively.
 
 * :mod:`ast`:
 
@@ -329,7 +339,7 @@ Build changes
 =============
 
 * Remove the bundled copy of the libmpdec_ decimal library from the CPython source tree
-  to simplify maintenence and updates. The :mod:`decimal` module will now
+  to simplify maintenance and updates. The :mod:`decimal` module will now
   unconditionally use the system's libmpdec decimal library. Also remove the
   now unused :option:`!--with-system-libmpdec` :program:`configure` flag.
   This change has no impact on binary releases of Python, which have been

Lib/_pyio.py

@@ -1928,7 +1928,7 @@ def truncate(self, pos=None):
         """Truncate size to pos, where pos is an int."""
         self._unsupported("truncate")
 
-    def readline(self):
+    def readline(self, size=-1, /):
         """Read until newline or EOF.
 
         Returns an empty string if EOF is hit immediately.

Lib/test/test_type_params.py

@@ -1,4 +1,5 @@
 import annotationlib
+import inspect
 import textwrap
 import types
 import unittest
@@ -1446,6 +1447,30 @@ def f[T: int = int, **P = int, *Ts = int](): pass
                 self.assertIs(annotationlib.call_evaluate_function(case, annotationlib.Format.FORWARDREF), int)
                 self.assertEqual(annotationlib.call_evaluate_function(case, annotationlib.Format.STRING), 'int')
 
+    def test_signature(self):
+        # gh-151665: the ".format" parameter of compiler-generated evaluators
+        # used to break inspect.signature(). It should show up as "format".
+        type Alias = int
+        def f[T: int = int, **P = int, *Ts = int](): pass
+        T, P, Ts = f.__type_params__
+        def g[U: (int, str)](): pass
+        U, = g.__type_params__
+        cases = [
+            Alias.evaluate_value,
+            T.evaluate_bound,
+            T.evaluate_default,
+            P.evaluate_default,
+            Ts.evaluate_default,
+            U.evaluate_constraints,
+        ]
+        for case in cases:
+            with self.subTest(case=case):
+                sig = inspect.signature(case)
+                self.assertEqual(str(sig), '(format=1, /)')
+                param, = sig.parameters.values()
+                self.assertEqual(param.name, 'format')
+                self.assertIs(param.kind, inspect.Parameter.POSITIONAL_ONLY)
+
     def test_constraints(self):
         def f[T: (int, str)](): pass
         T, = f.__type_params__

Lib/venv/scripts/common/activate.fish

@@ -34,6 +34,9 @@ end
 deactivate nondestructive
 
 set -gx VIRTUAL_ENV __VENV_DIR__
+if string match -qr 'CYGWIN|MSYS|MINGW' (uname)
+    set -gx VIRTUAL_ENV (cygpath -u $VIRTUAL_ENV)
+end
 
 set -gx _OLD_VIRTUAL_PATH $PATH
 set -gx PATH "$VIRTUAL_ENV/"__VENV_BIN_NAME__ $PATH

Misc/NEWS.d/next/Core_and_Builtins/2026-06-21-12-55-18.gh-issue-151665.82fmzx.rst

@@ -0,0 +1,2 @@
+:func:`inspect.signature` now works on the lazy evaluators of type aliases
+and type parameters instead of raising :exc:`ValueError`.

Misc/NEWS.d/next/Core_and_Builtins/2026-06-22-06-26-34.gh-issue-151905.FOLMYg.rst

@@ -0,0 +1 @@
+Fix OOM error handling in :c:func:`PyFrame_GetBack` to propagate exceptions instead of masking them as None.

Misc/NEWS.d/next/Library/2026-06-07-13-47-05.gh-issue-151042.NMdzF2.rst

@@ -0,0 +1 @@
+Fixed venv exporting mixed path styles to PATH on Windows inside fish (via Cygwin, MinGW or MSYS2)

Misc/NEWS.d/next/Library/2026-06-18-23-59-46.gh-issue-151596.5ma144.rst

@@ -0,0 +1 @@
+Add missing ``size`` positional argument to the pure-Python implementation of :meth:`io.TextIOBase.readline`.