[django-environ] Use generics for CastDict. Comment on usage of Any type.

Author: marcus

stubs/django-environ/environ/environ.pyi

@@ -13,7 +13,7 @@ from builtins import (
 )
 from collections.abc import Callable, Mapping, MutableMapping
 from logging import Logger
-from typing import IO, Any, ClassVar, SupportsIndex, TypedDict, TypeVar, overload, type_check_only
+from typing import IO, Any, ClassVar, Generic, SupportsIndex, TypedDict, TypeVar, overload, type_check_only
 from typing_extensions import Required, TypeAlias, Unpack
 from urllib.parse import ParseResult
 
@@ -24,16 +24,17 @@ logger: Logger
 
 class NoValue: ...
 
-_T = TypeVar("_T")
-_Cast: TypeAlias = Callable[[str], _T]
+_T1 = TypeVar("_T1")
+_T2 = TypeVar("_T2")
+_Cast: TypeAlias = Callable[[str], _T1]
 _SchemeValue: TypeAlias = _Cast[Any] | tuple[_Cast[Any], Any]
 _EmptyDict: TypeAlias = dict[object, object]  # stands for {}
 
 @type_check_only
-class CastDict(TypedDict, total=False):
-    key: _Cast[Any]
-    value: _Cast[Any]
-    cast: dict[str, _Cast[Any]]
+class CastDict(TypedDict, Generic[_T1, _T2], total=False):
+    key: _Cast[_T1]
+    value: _Cast[_T2]
+    cast: dict[str, _Cast[Any]]  # value cast by key
 
 @type_check_only
 class PathKwargs(TypedDict, total=False):
@@ -154,21 +155,22 @@ class Env:
     def __init__(self, **scheme: _SchemeValue) -> None: ...
     @overload
     def __call__(
-        self, var: _str, cast: _Cast[_T] | None = None, default: _T | NoValue = ..., parse_default: _bool = False
-    ) -> _T: ...
+        self, var: _str, cast: _Cast[_T1] | None = None, default: _T1 | NoValue = ..., parse_default: _bool = False
+    ) -> _T1: ...
     @overload
     def __call__(
-        self, var: _str, cast: _list[_Cast[_T]], default: _list[_T] | NoValue = ..., parse_default: _bool = False
-    ) -> _list[_T]: ...
+        self, var: _str, cast: _list[_Cast[_T1]], default: _list[_T1] | NoValue = ..., parse_default: _bool = False
+    ) -> _list[_T1]: ...
     @overload
     def __call__(
-        self, var: _str, cast: _tuple[_Cast[_T]], default: _tuple[_T] | NoValue = ..., parse_default: _bool = False
-    ) -> _tuple[_T]: ...
+        self, var: _str, cast: _tuple[_Cast[_T1]], default: _tuple[_T1] | NoValue = ..., parse_default: _bool = False
+    ) -> _tuple[_T1]: ...
     @overload
     def __call__(
-        self, var: _str, cast: CastDict, default: _dict[Any, Any] | NoValue = ..., parse_default: _bool = False
-    ) -> _dict[Any, Any]: ...
+        self, var: _str, cast: CastDict[_T1, _T2], default: _dict[_T1, _T2] | NoValue = ..., parse_default: _bool = False
+    ) -> _dict[_T1, _T2]: ...
     @overload
+    # Any (subclass of) list/tuple/dict builtin types are valid for cast.
     def __call__(
         self, var: _str, cast: type[_list[Any]], default: _list[_str] | NoValue = ..., parse_default: _bool = False
     ) -> _list[_str]: ...
@@ -187,12 +189,12 @@ class Env:
     def int(self, var: _str, default: _int | NoValue = ...) -> _int: ...
     def float(self, var: _str, default: _float | NoValue = ...) -> _float: ...
     def json(self, var: _str, default: Any | NoValue = ...) -> Any: ...
-    def list(self, var: _str, cast: _Cast[_T] | None = None, default: _list[_T] | NoValue = ...) -> _list[_T]: ...
-    def tuple(self, var: _str, cast: _Cast[_T] | None = None, default: _tuple[_T] | NoValue = ...) -> _tuple[_T]: ...
+    def list(self, var: _str, cast: _Cast[_T1] | None = None, default: _list[_T1] | NoValue = ...) -> _list[_T1]: ...
+    def tuple(self, var: _str, cast: _Cast[_T1] | None = None, default: _tuple[_T1] | NoValue = ...) -> _tuple[_T1]: ...
     @overload
     def dict(self, var: _str, cast: None = ..., default: _dict[_str, Any] | NoValue = ...) -> _dict[_str, Any]: ...
     @overload
-    def dict(self, var: _str, cast: _Cast[_T], default: _dict[Any, _T] | NoValue = ...) -> _dict[Any, _T]: ...
+    def dict(self, var: _str, cast: _Cast[_T1], default: _dict[Any, _T1] | NoValue = ...) -> _dict[Any, _T1]: ...
     def url(self, var: _str, default: _str | NoValue = ...) -> _str: ...
     def db_url(
         self, var: _str = ..., default: _str | NoValue = ..., engine: _str | None = None
@@ -220,21 +222,22 @@ class Env:
     def path(self, var: _str, default: _str | NoValue = ..., **kwargs: Unpack[PathKwargs]) -> Path: ...
     @overload
     def get_value(
-        self, var: _str, cast: _Cast[_T] | None = None, default: _T | NoValue = ..., parse_default: _bool = False
-    ) -> _T: ...
+        self, var: _str, cast: _Cast[_T1] | None = None, default: _T1 | NoValue = ..., parse_default: _bool = False
+    ) -> _T1: ...
     @overload
     def get_value(
-        self, var: _str, cast: _list[_Cast[_T]], default: _list[_T] | NoValue = ..., parse_default: _bool = False
-    ) -> _list[_T]: ...
+        self, var: _str, cast: _list[_Cast[_T1]], default: _list[_T1] | NoValue = ..., parse_default: _bool = False
+    ) -> _list[_T1]: ...
     @overload
     def get_value(
-        self, var: _str, cast: _tuple[_Cast[_T]], default: _tuple[_T] | NoValue = ..., parse_default: _bool = False
-    ) -> _tuple[_T]: ...
+        self, var: _str, cast: _tuple[_Cast[_T1]], default: _tuple[_T1] | NoValue = ..., parse_default: _bool = False
+    ) -> _tuple[_T1]: ...
     @overload
     def get_value(
-        self, var: _str, cast: CastDict, default: _dict[Any, Any] | NoValue = ..., parse_default: _bool = False
-    ) -> _dict[Any, Any]: ...
+        self, var: _str, cast: CastDict[_T1, _T2], default: _dict[_T1, _T2] | NoValue = ..., parse_default: _bool = False
+    ) -> _dict[_T1, _T2]: ...
     @overload
+    # Any (subclass of) list/tuple/dict builtin types are valid for cast.
     def get_value(
         self, var: _str, cast: type[_list[Any]], default: _list[_str] | NoValue = ..., parse_default: _bool = False
     ) -> _list[_str]: ...
@@ -251,22 +254,23 @@ class Env:
     def parse_value(cls, value: _str, cast: None) -> _str: ...
     @classmethod
     @overload
-    def parse_value(cls, value: _str, cast: _Cast[_T]) -> _T: ...
+    def parse_value(cls, value: _str, cast: _Cast[_T1]) -> _T1: ...
     @classmethod
     @overload
-    def parse_value(cls, value: _str, cast: _list[_Cast[_T]]) -> _list[_T]: ...
+    def parse_value(cls, value: _str, cast: _list[_Cast[_T1]]) -> _list[_T1]: ...
     @classmethod
     @overload
-    def parse_value(cls, value: _str, cast: _tuple[_Cast[_T], ...]) -> _tuple[_T]: ...
+    def parse_value(cls, value: _str, cast: _tuple[_Cast[_T1], ...]) -> _tuple[_T1]: ...
     @classmethod
     @overload
-    def parse_value(cls, value: _str, cast: CastDict) -> _dict[Any, Any]: ...
+    def parse_value(cls, value: _str, cast: CastDict[_T1, _T2]) -> _dict[_T1, _T2]: ...
     @classmethod
     @overload
+    # Any (subclass of) list/tuple/dict builtin types are valid for cast.
     def parse_value(cls, value: _str, cast: type[_list[Any]]) -> _list[_str]: ...
     @classmethod
     @overload
-    def parse_value(cls, value: _str, cast: type[_tuple[Any, ...]]) -> _tuple[_str]: ...
+    def parse_value(cls, value: _str, cast: type[_tuple[Any, ...]]) -> _tuple[_str, ...]: ...
     @classmethod
     @overload
     def parse_value(cls, value: _str, cast: type[_dict[Any, Any]]) -> _dict[_str, _str]: ...