Merge remote-tracking branch 'upstream/main' into test-coverage

Author: brianschubert

.github/workflows/third_party.yml

@@ -299,7 +299,7 @@ jobs:
       matrix:
         # PyPy is deliberately omitted here, since SQLAlchemy's tests
         # fail on PyPy for reasons unrelated to typing_extensions.
-        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
+        python-version: [ "3.10", "3.11", "3.12", "3.13" ]
         checkout-ref: [ "main", "rel_2_0" ]
     # sqlalchemy tests fail when using the Ubuntu 24.04 runner
     # https://github.com/sqlalchemy/sqlalchemy/commit/8d73205f352e68c6603e90494494ef21027ec68f

CHANGELOG.md

@@ -5,6 +5,10 @@
   `typing_extensions` implementation has raised an error on Python 3.10+ since
   `typing_extensions` v4.6.0. Patch by Brian Schubert.
 
+# Release 4.15.0 (August 25, 2025)
+
+No user-facing changes since 4.15.0rc1.
+
 # Release 4.15.0rc1 (August 18, 2025)
 
 - Add the `@typing_extensions.disjoint_base` decorator, as specified

doc/conf.py

@@ -38,6 +38,23 @@
 
 html_theme = 'alabaster'
 
+html_theme_options = {
+    "description": "Backported and experimental type hints for Python",
+    # Make the sidebar "sticky" so that is stays visible when scrolling.
+    # Also makes the sidebar appear at the top of the page on mobile.
+    "fixed_sidebar": True,
+}
+
+html_sidebars = {
+    '**': [
+        'about.html',
+        'searchfield.html',
+        'localtoc.html',
+    ]
+}
+
+# Don't include object entries (e.g. functions, classes) in the table of contents.
+toc_object_entries = False
 
 class MyTranslator(HTML5Translator):
     """Adds a link target to name without `typing_extensions.` prefix."""

doc/index.rst

@@ -259,6 +259,13 @@ Special typing primitives
 
    .. versionadded:: 4.12.0
 
+.. data:: NoExtraItems
+
+   A sentinel used when the ``extra_items`` class argument to :class:`TypedDict` is not
+   provided. In ``typing`` since 3.15.
+
+   .. versionadded:: 4.13.0
+
 .. data:: NotRequired
 
    See :py:data:`typing.NotRequired` and :pep:`655`. In ``typing`` since 3.11.
@@ -387,12 +394,13 @@ Special typing primitives
 
    .. versionadded:: 4.10.0
 
-.. class:: TypedDict(dict, total=True)
-
-   See :py:class:`typing.TypedDict` and :pep:`589`. In ``typing`` since 3.8.
+.. class:: TypedDict(dict, total=True, closed=False, extra_items=<no extra items>)
 
+   See :py:class:`typing.TypedDict` and :pep:`589`. In ``typing`` since 3.8, but
+   changed and enhanced in several ways since then.
    ``typing_extensions`` backports various bug fixes and improvements
-   to ``TypedDict`` on Python 3.11 and lower.
+   to ``TypedDict``.
+
    :py:class:`TypedDict` does not store runtime information
    about which (if any) keys are non-required in Python 3.8, and does not
    honor the ``total`` keyword with old-style ``TypedDict()`` in Python
@@ -426,35 +434,23 @@ Special typing primitives
 
       .. versionadded:: 4.9.0
 
-   The experimental ``closed`` keyword argument and the special key
-   ``__extra_items__`` proposed in :pep:`728` are supported.
-
-   When ``closed`` is unspecified or ``closed=False`` is given,
-   ``__extra_items__`` behaves like a regular key. Otherwise, this becomes a
-   special key that does not show up in ``__readonly_keys__``,
-   ``__mutable_keys__``, ``__required_keys__``, ``__optional_keys``, or
-   ``__annotations__``.
+   The ``closed`` and ``extra_items`` keyword arguments introduced by
+   :pep:`728` and supported in Python 3.15 and newer are supported.
 
    For runtime introspection, two attributes can be looked at:
 
    .. attribute:: __closed__
 
       A boolean flag indicating whether the current ``TypedDict`` is
-      considered closed. This is not inherited by the ``TypedDict``'s
-      subclasses.
+      considered closed. This reflects the ``closed`` class argument.
 
       .. versionadded:: 4.10.0
 
    .. attribute:: __extra_items__
 
-      The type annotation of the extra items allowed on the ``TypedDict``.
-      This attribute defaults to ``None`` on a TypedDict that has itself and
-      all its bases non-closed. This default is different from ``type(None)``
-      that represents ``__extra_items__: None`` defined on a closed
-      ``TypedDict``.
-
-      If ``__extra_items__`` is not defined or inherited on a closed
-      ``TypedDict``, this defaults to ``Never``.
+      The type of the extra items allowed on the ``TypedDict``.
+      This attribute defaults to :data:`NoExtraItems` if the ``extra_items``
+      class argument is not provided.
 
       .. versionadded:: 4.10.0
 
@@ -495,6 +491,16 @@ Special typing primitives
       The keyword argument ``closed`` and the special key ``__extra_items__``
       when ``closed=True`` is given were supported.
 
+   .. versionchanged:: 4.13.0
+
+      :pep:`728` support was updated to a newer version. Extra items are now
+      indicated with an ``extra_items`` class argument, not a special key
+      ``__extra_items__``.
+
+      A value assigned to ``__total__`` in the class body of a
+      ``TypedDict`` will be overwritten by the ``total`` argument of the
+      ``TypedDict`` constructor.
+
 .. class:: TypeVar(name, *constraints, bound=None, covariant=False,
                    contravariant=False, infer_variance=False, default=NoDefault)
 
@@ -696,7 +702,8 @@ Decorators
 
 .. decorator:: deprecated(msg, *, category=DeprecationWarning, stacklevel=1)
 
-   See :pep:`702`. In the :mod:`warnings` module since Python 3.13.
+   See :py:func:`warnings.deprecated` and :pep:`702`. In the :mod:`warnings` module
+   since Python 3.13.
 
    .. versionadded:: 4.5.0
 

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 # Project metadata
 [project]
 name = "typing_extensions"
-version = "4.15.0rc1"
+version = "4.15.0"
 description = "Backported and Experimental Type Hints for Python 3.9+"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -123,6 +123,7 @@ known-first-party = ["typing_extensions", "_typed_dict_test_helper"]
 
 [tool.coverage.report]
 fail_under = 96
+precision = 2
 show_missing = true
 # Omit files that are created in temporary directories during tests.
 # If not explicitly omitted they will result in warnings in the report.

src/typing_extensions.py

@@ -160,17 +160,48 @@
 # Added with bpo-45166 to 3.10.1+ and some 3.9 versions
 _FORWARD_REF_HAS_CLASS = "__forward_is_class__" in typing.ForwardRef.__slots__
 
-# The functions below are modified copies of typing internal helpers.
-# They are needed by _ProtocolMeta and they provide support for PEP 646.
+class Sentinel:
+    """Create a unique sentinel object.
+
+    *name* should be the name of the variable to which the return value shall be assigned.
 
+    *repr*, if supplied, will be used for the repr of the sentinel object.
+    If not provided, "<name>" will be used.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        repr: typing.Optional[str] = None,
+    ):
+        self._name = name
+        self._repr = repr if repr is not None else f'<{name}>'
 
-class _Sentinel:
     def __repr__(self):
-        return "<sentinel>"
+        return self._repr
+
+    if sys.version_info < (3, 11):
+        # The presence of this method convinces typing._type_check
+        # that Sentinels are types.
+        def __call__(self, *args, **kwargs):
+            raise TypeError(f"{type(self).__name__!r} object is not callable")
 
+    # Breakpoint: https://github.com/python/cpython/pull/21515
+    if sys.version_info >= (3, 10):
+        def __or__(self, other):
+            return typing.Union[self, other]
+
+        def __ror__(self, other):
+            return typing.Union[other, self]
+
+    def __getstate__(self):
+        raise TypeError(f"Cannot pickle {type(self).__name__!r} object")
 
-_marker = _Sentinel()
 
+_marker = Sentinel("sentinel")
+
+# The functions below are modified copies of typing internal helpers.
+# They are needed by _ProtocolMeta and they provide support for PEP 646.
 
 # Breakpoint: https://github.com/python/cpython/pull/27342
 if sys.version_info >= (3, 10):
@@ -4206,44 +4237,6 @@ def evaluate_forward_ref(
             )
 
 
-class Sentinel:
-    """Create a unique sentinel object.
-
-    *name* should be the name of the variable to which the return value shall be assigned.
-
-    *repr*, if supplied, will be used for the repr of the sentinel object.
-    If not provided, "<name>" will be used.
-    """
-
-    def __init__(
-        self,
-        name: str,
-        repr: typing.Optional[str] = None,
-    ):
-        self._name = name
-        self._repr = repr if repr is not None else f'<{name}>'
-
-    def __repr__(self):
-        return self._repr
-
-    if sys.version_info < (3, 11):
-        # The presence of this method convinces typing._type_check
-        # that Sentinels are types.
-        def __call__(self, *args, **kwargs):
-            raise TypeError(f"{type(self).__name__!r} object is not callable")
-
-    # Breakpoint: https://github.com/python/cpython/pull/21515
-    if sys.version_info >= (3, 10):
-        def __or__(self, other):
-            return typing.Union[self, other]
-
-        def __ror__(self, other):
-            return typing.Union[other, self]
-
-    def __getstate__(self):
-        raise TypeError(f"Cannot pickle {type(self).__name__!r} object")
-
-
 if sys.version_info >= (3, 14, 0, "beta"):
     type_repr = annotationlib.type_repr
 else: