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

Set default strict_optional state to True #18198

Merged
merged 3 commits into from
Nov 27, 2024
Merged

Set default strict_optional state to True #18198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8010174
Set default strict_optional state to True
hauntsaninja Nov 27, 2024
c5dc7e7
fix
hauntsaninja Nov 27, 2024
711867b
.
hauntsaninja Nov 27, 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/state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ def strict_optional_set(self, value: bool) -> Iterator[None]:
self.strict_optional = saved


state: Final = StrictOptionalState(strict_optional=False)
state: Final = StrictOptionalState(strict_optional=True)
find_occurrences: tuple[str, str] | None = None
4 changes: 2 additions & 2 deletions mypy/test/testsubtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from mypy.subtypes import is_subtype
from mypy.test.helpers import Suite
from mypy.test.typefixture import InterfaceTypeFixture, TypeFixture
from mypy.types import Instance, Type, UnpackType
from mypy.types import Instance, Type, UninhabitedType, UnpackType


class SubtypingSuite(Suite):
Expand Down Expand Up @@ -87,7 +87,7 @@ def test_basic_callable_subtyping(self) -> None:
)

self.assert_strict_subtype(
self.fx.callable(self.fx.a, self.fx.nonet), self.fx.callable(self.fx.a, self.fx.a)
self.fx.callable(self.fx.a, UninhabitedType()), self.fx.callable(self.fx.a, self.fx.a)
)

self.assert_unrelated(
Expand Down
110 changes: 67 additions & 43 deletions mypy/test/testtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,18 +766,19 @@ def test_type_vars(self) -> None:
self.assert_join(self.fx.t, self.fx.s, self.fx.o)

def test_none(self) -> None:
# Any type t joined with None results in t.
for t in [
NoneType(),
self.fx.a,
self.fx.o,
UnboundType("x"),
self.fx.t,
self.tuple(),
self.callable(self.fx.a, self.fx.b),
self.fx.anyt,
]:
self.assert_join(t, NoneType(), t)
with state.strict_optional_set(False):
# Any type t joined with None results in t.
for t in [
NoneType(),
self.fx.a,
self.fx.o,
UnboundType("x"),
self.fx.t,
self.tuple(),
self.callable(self.fx.a, self.fx.b),
self.fx.anyt,
]:
self.assert_join(t, NoneType(), t)

def test_unbound_type(self) -> None:
self.assert_join(UnboundType("x"), UnboundType("x"), self.fx.anyt)
Expand All @@ -798,11 +799,15 @@ def test_unbound_type(self) -> None:

def test_any_type(self) -> None:
# Join against 'Any' type always results in 'Any'.
with state.strict_optional_set(False):
self.assert_join(NoneType(), self.fx.anyt, self.fx.anyt)

for t in [
self.fx.anyt,
self.fx.a,
self.fx.o,
NoneType(),
# TODO: fix this is not currently symmetric
# NoneType(),
UnboundType("x"),
self.fx.t,
self.tuple(),
Expand Down Expand Up @@ -834,7 +839,11 @@ def test_other_mixed_types(self) -> None:
self.assert_join(t1, t2, self.fx.o)

def test_simple_generics(self) -> None:
self.assert_join(self.fx.ga, self.fx.nonet, self.fx.ga)
with state.strict_optional_set(False):
self.assert_join(self.fx.ga, self.fx.nonet, self.fx.ga)
with state.strict_optional_set(True):
self.assert_join(self.fx.ga, self.fx.nonet, UnionType([self.fx.ga, NoneType()]))

self.assert_join(self.fx.ga, self.fx.anyt, self.fx.anyt)

for t in [
Expand Down Expand Up @@ -1105,22 +1114,24 @@ def test_class_subtyping(self) -> None:
self.assert_meet(self.fx.a, self.fx.o, self.fx.a)
self.assert_meet(self.fx.a, self.fx.b, self.fx.b)
self.assert_meet(self.fx.b, self.fx.o, self.fx.b)
self.assert_meet(self.fx.a, self.fx.d, NoneType())
self.assert_meet(self.fx.b, self.fx.c, NoneType())
self.assert_meet(self.fx.a, self.fx.d, UninhabitedType())
self.assert_meet(self.fx.b, self.fx.c, UninhabitedType())

def test_tuples(self) -> None:
self.assert_meet(self.tuple(), self.tuple(), self.tuple())
self.assert_meet(self.tuple(self.fx.a), self.tuple(self.fx.a), self.tuple(self.fx.a))
self.assert_meet(
self.tuple(self.fx.b, self.fx.c),
self.tuple(self.fx.a, self.fx.d),
self.tuple(self.fx.b, NoneType()),
self.tuple(self.fx.b, UninhabitedType()),
)

self.assert_meet(
self.tuple(self.fx.a, self.fx.a), self.fx.std_tuple, self.tuple(self.fx.a, self.fx.a)
)
self.assert_meet(self.tuple(self.fx.a), self.tuple(self.fx.a, self.fx.a), NoneType())
self.assert_meet(
self.tuple(self.fx.a), self.tuple(self.fx.a, self.fx.a), UninhabitedType()
)

def test_function_types(self) -> None:
self.assert_meet(
Expand All @@ -1143,23 +1154,36 @@ def test_function_types(self) -> None:
def test_type_vars(self) -> None:
self.assert_meet(self.fx.t, self.fx.t, self.fx.t)
self.assert_meet(self.fx.s, self.fx.s, self.fx.s)
self.assert_meet(self.fx.t, self.fx.s, NoneType())
self.assert_meet(self.fx.t, self.fx.s, UninhabitedType())

def test_none(self) -> None:
self.assert_meet(NoneType(), NoneType(), NoneType())

self.assert_meet(NoneType(), self.fx.anyt, NoneType())

# Any type t joined with None results in None, unless t is Any.
for t in [
self.fx.a,
self.fx.o,
UnboundType("x"),
self.fx.t,
self.tuple(),
self.callable(self.fx.a, self.fx.b),
]:
self.assert_meet(t, NoneType(), NoneType())
with state.strict_optional_set(False):
for t in [
self.fx.a,
self.fx.o,
UnboundType("x"),
self.fx.t,
self.tuple(),
self.callable(self.fx.a, self.fx.b),
]:
self.assert_meet(t, NoneType(), NoneType())

with state.strict_optional_set(True):
self.assert_meet(self.fx.o, NoneType(), NoneType())
for t in [
self.fx.a,
# TODO: fix this is not currently symmetric
# UnboundType("x"),
self.fx.t,
self.tuple(),
self.callable(self.fx.a, self.fx.b),
]:
self.assert_meet(t, NoneType(), UninhabitedType())

def test_unbound_type(self) -> None:
self.assert_meet(UnboundType("x"), UnboundType("x"), self.fx.anyt)
Expand Down Expand Up @@ -1197,28 +1221,28 @@ def test_simple_generics(self) -> None:
self.assert_meet(self.fx.ga, self.fx.ga, self.fx.ga)
self.assert_meet(self.fx.ga, self.fx.o, self.fx.ga)
self.assert_meet(self.fx.ga, self.fx.gb, self.fx.gb)
self.assert_meet(self.fx.ga, self.fx.gd, self.fx.nonet)
self.assert_meet(self.fx.ga, self.fx.g2a, self.fx.nonet)
self.assert_meet(self.fx.ga, self.fx.gd, UninhabitedType())
self.assert_meet(self.fx.ga, self.fx.g2a, UninhabitedType())

self.assert_meet(self.fx.ga, self.fx.nonet, self.fx.nonet)
self.assert_meet(self.fx.ga, self.fx.nonet, UninhabitedType())
self.assert_meet(self.fx.ga, self.fx.anyt, self.fx.ga)

for t in [self.fx.a, self.fx.t, self.tuple(), self.callable(self.fx.a, self.fx.b)]:
self.assert_meet(t, self.fx.ga, self.fx.nonet)
self.assert_meet(t, self.fx.ga, UninhabitedType())

def test_generics_with_multiple_args(self) -> None:
self.assert_meet(self.fx.hab, self.fx.hab, self.fx.hab)
self.assert_meet(self.fx.hab, self.fx.haa, self.fx.hab)
self.assert_meet(self.fx.hab, self.fx.had, self.fx.nonet)
self.assert_meet(self.fx.hab, self.fx.had, UninhabitedType())
self.assert_meet(self.fx.hab, self.fx.hbb, self.fx.hbb)

def test_generics_with_inheritance(self) -> None:
self.assert_meet(self.fx.gsab, self.fx.gb, self.fx.gsab)
self.assert_meet(self.fx.gsba, self.fx.gb, self.fx.nonet)
self.assert_meet(self.fx.gsba, self.fx.gb, UninhabitedType())

def test_generics_with_inheritance_and_shared_supertype(self) -> None:
self.assert_meet(self.fx.gsba, self.fx.gs2a, self.fx.nonet)
self.assert_meet(self.fx.gsab, self.fx.gs2a, self.fx.nonet)
self.assert_meet(self.fx.gsba, self.fx.gs2a, UninhabitedType())
self.assert_meet(self.fx.gsab, self.fx.gs2a, UninhabitedType())

def test_generic_types_and_dynamic(self) -> None:
self.assert_meet(self.fx.gdyn, self.fx.ga, self.fx.ga)
Expand All @@ -1232,33 +1256,33 @@ def test_callables_with_dynamic(self) -> None:

def test_meet_interface_types(self) -> None:
self.assert_meet(self.fx.f, self.fx.f, self.fx.f)
self.assert_meet(self.fx.f, self.fx.f2, self.fx.nonet)
self.assert_meet(self.fx.f, self.fx.f2, UninhabitedType())
self.assert_meet(self.fx.f, self.fx.f3, self.fx.f3)

def test_meet_interface_and_class_types(self) -> None:
self.assert_meet(self.fx.o, self.fx.f, self.fx.f)
self.assert_meet(self.fx.a, self.fx.f, self.fx.nonet)
self.assert_meet(self.fx.a, self.fx.f, UninhabitedType())

self.assert_meet(self.fx.e, self.fx.f, self.fx.e)

def test_meet_class_types_with_shared_interfaces(self) -> None:
# These have nothing special with respect to meets, unlike joins. These
# are for completeness only.
self.assert_meet(self.fx.e, self.fx.e2, self.fx.nonet)
self.assert_meet(self.fx.e2, self.fx.e3, self.fx.nonet)
self.assert_meet(self.fx.e, self.fx.e2, UninhabitedType())
self.assert_meet(self.fx.e2, self.fx.e3, UninhabitedType())

def test_meet_with_generic_interfaces(self) -> None:
fx = InterfaceTypeFixture()
self.assert_meet(fx.gfa, fx.m1, fx.m1)
self.assert_meet(fx.gfa, fx.gfa, fx.gfa)
self.assert_meet(fx.gfb, fx.m1, fx.nonet)
self.assert_meet(fx.gfb, fx.m1, UninhabitedType())

def test_type_type(self) -> None:
self.assert_meet(self.fx.type_a, self.fx.type_b, self.fx.type_b)
self.assert_meet(self.fx.type_b, self.fx.type_any, self.fx.type_b)
self.assert_meet(self.fx.type_b, self.fx.type_type, self.fx.type_b)
self.assert_meet(self.fx.type_b, self.fx.type_c, self.fx.nonet)
self.assert_meet(self.fx.type_c, self.fx.type_d, self.fx.nonet)
self.assert_meet(self.fx.type_b, self.fx.type_c, self.fx.type_never)
self.assert_meet(self.fx.type_c, self.fx.type_d, self.fx.type_never)
self.assert_meet(self.fx.type_type, self.fx.type_any, self.fx.type_any)
self.assert_meet(self.fx.type_b, self.fx.anyt, self.fx.type_b)

Expand Down
1 change: 1 addition & 0 deletions mypy/test/typefixture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ def make_type_var(
self.type_d = TypeType.make_normalized(self.d)
self.type_t = TypeType.make_normalized(self.t)
self.type_any = TypeType.make_normalized(self.anyt)
self.type_never = TypeType.make_normalized(UninhabitedType())

self._add_bool_dunder(self.bool_type_info)
self._add_bool_dunder(self.ai)
Expand Down