8000 Fix crash on deferred value constrained TypeVar by hauntsaninja · Pull Request #14642 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Fix crash on deferred value constrained TypeVar #14642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hauntsaninja merged 2 commits into from
Feb 8, 2023
Merged

Fix crash on deferred value constrained TypeVar #14642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03981f3
Fix crash on deferred value constrained TypeVar
hauntsaninja Feb 8, 2023
61914c2
also add to hash
hauntsaninja Feb 8, 2023
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
8 changes: 6 additions & 2 deletions mypy/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,12 +590,16 @@ def accept(self, visitor: TypeVisitor[T]) -> T:
return visitor.visit_type_var(self)

def __hash__(self) -> int:
return hash((self.id, self.upper_bound))
return hash((self.id, self.upper_bound, tuple(self.values)))

def __eq__(self, other: object) -> bool:
if not isinstance(other, TypeVarType):
return NotImplemented
return self.id == other.id and self.upper_bound == other.upper_bound
return (
self.id == other.id
and self.upper_bound == other.upper_bound
and self.values == other.values
)

def serialize(self) -> JsonDict:
assert not self.id.is_meta_var()
Expand Down
9 changes: 9 additions & 0 deletions test-data/unit/check-typevar-values.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,3 +702,12 @@ class Indexable:

[builtins fixtures/tuple.pyi]
[builtins fixtures/classmethod.pyi]

[case testTypeVarWithValueDeferral]
from typing import TypeVar, Callable

T = TypeVar("T", "A", "B")
Func = Callable[[], T]

class A: ...
class B: ...
0