Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions test-data/unit/check-typeguard.test
Original file line number Diff line number Diff line change
Expand Up @@ -807,16 +807,16 @@ def test() -> None:
[case testTypeGuardedTypeDoesNotLeak]
# https://github.com/python/mypy/issues/18895
from enum import Enum
from typing import Union
from typing_extensions import TypeGuard, Literal
from typing import Literal, Union
from typing_extensions import TypeGuard

class Model(str, Enum):
MODEL_A1 = 'model_a1'
MODEL_A2 = 'model_a2'
MODEL_B = 'model_b'
A1 = 'model_a1'
A2 = 'model_a2'
B = 'model_b'

MODEL_A = Literal[Model.MODEL_A1, Model.MODEL_A2]
MODEL_B = Literal[Model.MODEL_B]
MODEL_A = Literal[Model.A1, Model.A2]
MODEL_B = Literal[Model.B]

def is_model_a(model: str) -> TypeGuard[MODEL_A]:
return True
Expand All @@ -829,7 +829,6 @@ def process_model(model: Union[MODEL_A, MODEL_B]) -> int:

def handle(model: Model) -> int:
if is_model_a(model) or is_model_b(model):
# TODO: should start passing after #18896
return process_model(model) # E: Argument 1 to "process_model" has incompatible type "Model"; expected "Union[Literal[Model.MODEL_A1, Model.MODEL_A2], Literal[Model.MODEL_B]]"
return process_model(model)
return 0
[builtins fixtures/tuple.pyi]
16 changes: 16 additions & 0 deletions test-data/unit/check-typeis.test
Original file line number Diff line number Diff line change
Expand Up @@ -936,3 +936,19 @@ def func(arg: Any) -> None:
if is_dataclass(arg):
reveal_type(arg) # N: Revealed type is "Union[Type[__main__.DataclassInstance], __main__.DataclassInstance]"
[builtins fixtures/tuple.pyi]

[case testTypeIsEnumOverlappingUnionExcludesIrrelevant]
from enum import Enum
from typing import Literal
from typing_extensions import TypeIs

class Model(str, Enum):
A = 'a'
B = 'a'

def is_model_a(model: str) -> TypeIs[Literal[Model.A, "foo"]]:
return True
def handle(model: Model) -> None:
if is_model_a(model):
reveal_type(model) # N: Revealed type is "Literal[__main__.Model.A]"
[builtins fixtures/tuple.pyi]