Merge branch 'main' into typeform-generic-classgetitem

Author: Andrew5057

requirements-tests.txt

@@ -1,6 +1,6 @@
 # Type checkers that we test our stubs against. These should always
 # be pinned to a specific version to make failure reproducible.
-mypy==2.0.0
+mypy==2.1.0
 pyright==1.1.409
 
 # Libraries used by our various scripts.

stdlib/string/templatelib.pyi

@@ -1,34 +1,34 @@
 from collections.abc import Iterator
 from types import GenericAlias
-from typing import Any, Literal, TypeVar, final, overload
+from typing import Any, Generic, Literal, TypeVar, final, overload
 from typing_extensions import TypeForm
 
 _T = TypeVar("_T")
 
 @final
 class Template:  # TODO: consider making `Template` generic on `TypeVarTuple`
     strings: tuple[str, ...]
-    interpolations: tuple[Interpolation, ...]
+    interpolations: tuple[Interpolation[Any], ...]
 
-    def __new__(cls, *args: str | Interpolation) -> Template: ...
-    def __iter__(self) -> Iterator[str | Interpolation]: ...
+    def __new__(cls, *args: str | Interpolation[Any]) -> Template: ...
+    def __iter__(self) -> Iterator[str | Interpolation[Any]]: ...
     def __add__(self, other: Template, /) -> Template: ...
     def __class_getitem__(cls, item: TypeForm[Any], /) -> GenericAlias: ...
     @property
     def values(self) -> tuple[Any, ...]: ...  # Tuple of interpolation values, which can have any type
 
 @final
-class Interpolation:
-    value: Any  # TODO: consider making `Interpolation` generic in runtime
+class Interpolation(Generic[_T]):
+    value: _T
     expression: str
     conversion: Literal["a", "r", "s"] | None
     format_spec: str
 
     __match_args__ = ("value", "expression", "conversion", "format_spec")
 
     def __new__(
-        cls, value: Any, expression: str = "", conversion: Literal["a", "r", "s"] | None = None, format_spec: str = ""
-    ) -> Interpolation: ...
+        cls, value: _T, expression: str = "", conversion: Literal["a", "r", "s"] | None = None, format_spec: str = ""
+    ) -> Interpolation[_T]: ...
     def __class_getitem__(cls, item: TypeForm[Any], /) -> GenericAlias: ...
 
 @overload