Skip to content

Commit f38d409

Browse files
committed
Apply TypeVar defaults (functions)
1 parent ef479c6 commit f38d409

File tree

2 files changed

+39
-1
lines changed

2 files changed

+39
-1
lines changed

mypy/applytype.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
TypeVarLikeType,
1818
TypeVarTupleType,
1919
TypeVarType,
20+
UninhabitedType,
2021
UnpackType,
2122
get_proper_type,
2223
)
@@ -31,13 +32,15 @@ def get_target_type(
3132
context: Context,
3233
skip_unsatisfied: bool,
3334
) -> Type | None:
35+
p_type = get_proper_type(type)
36+
if isinstance(p_type, UninhabitedType) and tvar.has_default():
37+
return tvar.default
3438
if isinstance(tvar, ParamSpecType):
3539
return type
3640
if isinstance(tvar, TypeVarTupleType):
3741
return type
3842
assert isinstance(tvar, TypeVarType)
3943
values = tvar.values
40-
p_type = get_proper_type(type)
4144
if values:
4245
if isinstance(p_type, AnyType):
4346
return type

test-data/unit/check-typevar-defaults.test

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,38 @@ Ts1 = TypeVarTuple("Ts1", default=2) # E: TypeVarTuple "default" must be a type
7171
Ts2 = TypeVarTuple("Ts2", default=int) # E: The default argument to TypeVarTuple must be an Unpacked tuple
7272
Ts3 = TypeVarTuple("Ts3", default=Tuple[int]) # E: The default argument to TypeVarTuple must be an Unpacked tuple
7373
[builtins fixtures/tuple.pyi]
74+
75+
[case testTypeVarDefaultsFunctions]
76+
from typing import TypeVar, ParamSpec, List, Union, Callable, Tuple
77+
from typing_extensions import TypeVarTuple, Unpack
78+
79+
T1 = TypeVar("T1", default=str)
80+
T2 = TypeVar("T2", bound=str, default=str)
81+
T3 = TypeVar("T3", bytes, str, default=str)
82+
P1 = ParamSpec("P1", default=(int, str))
83+
Ts1 = TypeVarTuple("Ts1", default=Unpack[Tuple[int, str]])
84+
85+
def callback1(x: str) -> None: ...
86+
87+
def func_a1(x: Union[int, T1]) -> T1: ...
88+
reveal_type(func_a1(2)) # N: Revealed type is "builtins.str"
89+
reveal_type(func_a1(2.1)) # N: Revealed type is "builtins.float"
90+
91+
def func_a2(x: Union[int, T1]) -> List[T1]: ...
92+
reveal_type(func_a2(2)) # N: Revealed type is "builtins.list[builtins.str]"
93+
reveal_type(func_a2(2.1)) # N: Revealed type is "builtins.list[builtins.float]"
94+
95+
def func_a3(x: Union[int, T2]) -> T2: ...
96+
reveal_type(func_a3(2)) # N: Revealed type is "builtins.str"
97+
98+
def func_a4(x: Union[int, T3]) -> T3: ...
99+
reveal_type(func_a4(2)) # N: Revealed type is "builtins.str"
100+
101+
def func_b1(x: Union[int, Callable[P1, None]]) -> Callable[P1, None]: ...
102+
reveal_type(func_b1(callback1)) # N: Revealed type is "def (x: builtins.str)"
103+
reveal_type(func_b1(2)) # N: Revealed type is "def (builtins.int, builtins.str)"
104+
105+
def func_c1(x: Union[int, Callable[[Unpack[Ts1]], None]]) -> Tuple[Unpack[Ts1]]: ...
106+
# reveal_type(func_c1(callback1)) # Revealed type is "builtins.tuple[str]" # TODO
107+
# reveal_type(func_c1(2)) # Revealed type is "builtins.tuple[builtins.int, builtins.str]" # TODO
108+
[builtins fixtures/tuple.pyi]

0 commit comments

Comments
 (0)