Skip to content
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

Join meet symmetric #18227

Merged
merged 2 commits into from
Dec 2, 2024
Merged

Join meet symmetric #18227

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
f185c29
update meet to return UninhabitedType() in the case of a None + Uninh…
MechanicalConstruct Dec 1, 2024
66b046b
update tests
MechanicalConstruct Dec 1, 2024
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
2 changes: 1 addition & 1 deletion mypy/join.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def visit_none_type(self, t: NoneType) -> ProperType:
if state.strict_optional:
if isinstance(self.s, (NoneType, UninhabitedType)):
return t
elif isinstance(self.s, UnboundType):
elif isinstance(self.s, (UnboundType, AnyType)):
return AnyType(TypeOfAny.special_form)
else:
return mypy.typeops.make_simplified_union([self.s, t])
Expand Down
2 changes: 1 addition & 1 deletion mypy/meet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ def __init__(self, s: ProperType) -> None:
def visit_unbound_type(self, t: UnboundType) -> ProperType:
if isinstance(self.s, NoneType):
if state.strict_optional:
return AnyType(TypeOfAny.special_form)
return UninhabitedType()
else:
return self.s
elif isinstance(self.s, UninhabitedType):
Expand Down
6 changes: 2 additions & 4 deletions mypy/test/testtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,7 @@ def test_any_type(self) -> None:
self.fx.anyt,
self.fx.a,
self.fx.o,
# TODO: fix this is not currently symmetric
# NoneType(),
NoneType(),
UnboundType("x"),
self.fx.t,
self.tuple(),
Expand Down Expand Up @@ -1177,8 +1176,7 @@ def test_none(self) -> None:
self.assert_meet(self.fx.o, NoneType(), NoneType())
for t in [
self.fx.a,
# TODO: fix this is not currently symmetric
# UnboundType("x"),
UnboundType("x"),
self.fx.t,
self.tuple(),
self.callable(self.fx.a, self.fx.b),
Expand Down