Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
22 changes: 15 additions & 7 deletions mypy/checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -2147,16 +2147,11 @@ def check_method_override_for_base_with_name(
# it can be checked for compatibility.
original_type = get_proper_type(base_attr.type)
original_node = base_attr.node
always_allow_covariant = False
if is_settable_property(defn) and (
is_settable_property(original_node) or isinstance(original_node, Var)
):
if is_custom_settable_property(defn) or (is_custom_settable_property(original_node)):
always_allow_covariant = True
self.check_setter_type_override(defn, base_attr, base)
# `original_type` can be partial if (e.g.) it is originally an
# instance variable from an `__init__` block that becomes deferred.
supertype_ready = True
if original_type is None or isinstance(original_type, PartialType):
supertype_ready = False
if self.pass_num < self.last_pass:
# If there are passes left, defer this node until next pass,
# otherwise try reconstructing the method type from available information.
Expand All @@ -2179,6 +2174,19 @@ def check_method_override_for_base_with_name(
else:
# Will always fail to typecheck below, since we know the node is a method
original_type = NoneType()

always_allow_covariant = False
if is_settable_property(defn) and (
is_settable_property(original_node) or isinstance(original_node, Var)
):
if is_custom_settable_property(defn) or (is_custom_settable_property(original_node)):
# Unlike with getter, where we try to construct some fallback type in case of
# deferral during last_pass, we can't make meaningful setter checks if the
# supertype is not known precisely.
if supertype_ready:
always_allow_covariant = True
self.check_setter_type_override(defn, base_attr, base)

if isinstance(original_node, (FuncDef, OverloadedFuncDef)):
original_class_or_static = original_node.is_class or original_node.is_static
elif isinstance(original_node, Decorator):
Expand Down
22 changes: 22 additions & 0 deletions test-data/unit/check-classes.test
Original file line number Diff line number Diff line change
Expand Up @@ -8443,3 +8443,25 @@ class C:
def x(self) -> None:
pass
[builtins fixtures/property.pyi]

[case testPropertySetterSuperclassDeferred]
from typing import Callable, TypeVar

class B:
def __init__(self) -> None:
self.foo = f()

class C(B):
@property
def foo(self) -> str: ...
@foo.setter # E: Incompatible override of a setter type \
# N: (base class "B" defined the type as "str", \
# N: override has type "int")
def foo(self, x: int) -> None: ...

T = TypeVar("T")
def deco(fn: Callable[[], list[T]]) -> Callable[[], T]: ...

@deco
def f() -> list[str]: ...
[builtins fixtures/property.pyi]