Skip to content

Commit 6cb2351

Browse files
committed
reformat
1 parent 96b71f5 commit 6cb2351

File tree

4 files changed

+31
-43
lines changed

4 files changed

+31
-43
lines changed

mypy/checker.py

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2055,9 +2055,9 @@ def check_setter_type_override(
20552055
original_type = get_raw_setter_type(base_node)
20562056
if isinstance(base_node, Var):
20572057
expanded_type = map_type_from_supertype(original_type, defn.info, base)
2058-
original_type = get_proper_type(expand_self_type(
2059-
base_node, expanded_type, fill_typevars(defn.info)
2060-
))
2058+
original_type = get_proper_type(
2059+
expand_self_type(base_node, expanded_type, fill_typevars(defn.info))
2060+
)
20612061
else:
20622062
assert isinstance(original_type, CallableType)
20632063
original_type = self.bind_and_map_method(base_attr, original_type, defn.info, base)
@@ -2114,9 +2114,7 @@ def check_method_override_for_base_with_name(
21142114
if is_settable_property(defn) and (
21152115
is_settable_property(original_node) or isinstance(original_node, Var)
21162116
):
2117-
if is_custom_settable_property(defn) or (
2118-
is_custom_settable_property(original_node)
2119-
):
2117+
if is_custom_settable_property(defn) or (is_custom_settable_property(original_node)):
21202118
always_allow_covariant = True
21212119
self.check_setter_type_override(defn, base_attr, base)
21222120
# `original_type` can be partial if (e.g.) it is originally an
@@ -3402,8 +3400,13 @@ def check_compatibility_all_supers(
34023400
if base_type:
34033401
assert base_node is not None
34043402
if not self.check_compatibility_super(
3405-
lvalue, lvalue_type, rvalue, base, base_type, base_node,
3406-
always_allow_covariant=custom_setter
3403+
lvalue,
3404+
lvalue_type,
3405+
rvalue,
3406+
base,
3407+
base_type,
3408+
base_node,
3409+
always_allow_covariant=custom_setter,
34073410
):
34083411
# Only show one error per variable; even if other
34093412
# base classes are also incompatible
@@ -3507,7 +3510,7 @@ def check_compatibility_super(
35073510
return True
35083511

35093512
def lvalue_type_from_base(
3510-
self, expr_node: Var, base: TypeInfo, setter_type: bool = False,
3513+
self, expr_node: Var, base: TypeInfo, setter_type: bool = False
35113514
) -> tuple[Type | None, SymbolNode | None]:
35123515
"""For a NameExpr that is part of a class, walk all base classes and try
35133516
to find the first class that defines a Type for the same name."""
@@ -3542,18 +3545,14 @@ def lvalue_type_from_base(
35423545
# value, not the Callable
35433546
if base_node.is_property:
35443547
base_type = get_proper_type(base_type.ret_type)
3545-
if isinstance(base_type, FunctionLike) and isinstance(
3546-
base_node, OverloadedFuncDef
3547-
):
3548+
if isinstance(base_type, FunctionLike) and isinstance(base_node, OverloadedFuncDef):
35483549
# Same for properties with setter
35493550
if base_node.is_property:
35503551
if setter_type:
35513552
assert isinstance(base_node.items[0], Decorator)
35523553
base_type = base_node.items[0].var.setter_type
35533554
assert isinstance(base_type, CallableType)
3554-
base_type = self.bind_and_map_method(
3555-
base_var, base_type, expr_node.info, base
3556-
)
3555+
base_type = self.bind_and_map_method(base_var, base_type, expr_node.info, base)
35573556
assert isinstance(base_type, CallableType)
35583557
base_type = get_proper_type(base_type.arg_types[0])
35593558
else:
@@ -8790,9 +8789,7 @@ def is_custom_settable_property(defn: SymbolNode | None) -> bool:
87908789
setter_type = var.setter_type.arg_types[1]
87918790
if isinstance(get_proper_type(setter_type), AnyType):
87928791
return False
8793-
return not is_same_type(
8794-
get_property_type(get_proper_type(var.type)), setter_type
8795-
)
8792+
return not is_same_type(get_property_type(get_proper_type(var.type)), setter_type)
87968793

87978794

87988795
def get_raw_setter_type(defn: OverloadedFuncDef | Var) -> ProperType:

mypy/messages.py

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,30 +1168,16 @@ def overload_signature_incompatible_with_supertype(
11681168
def incompatible_setter_override(
11691169
self, defn: Context, typ: Type, original_type: Type, base: TypeInfo
11701170
) -> None:
1171-
self.fail(
1172-
"Incompatible override of a setter type",
1173-
defn,
1174-
code=codes.OVERRIDE,
1175-
)
1176-
base_str, override_str = format_type_distinctly(
1177-
original_type, typ, options=self.options
1178-
)
1171+
self.fail("Incompatible override of a setter type", defn, code=codes.OVERRIDE)
1172+
base_str, override_str = format_type_distinctly(original_type, typ, options=self.options)
11791173
self.note(
11801174
f' (base class "{base.name}" defined the type as {base_str},',
11811175
defn,
11821176
code=codes.OVERRIDE,
11831177
)
1184-
self.note(
1185-
f" override has type {override_str})",
1186-
defn,
1187-
code=codes.OVERRIDE,
1188-
)
1178+
self.note(f" override has type {override_str})", defn, code=codes.OVERRIDE)
11891179
if is_subtype(typ, original_type):
1190-
self.note(
1191-
" Setter types should behave contravariantly",
1192-
defn,
1193-
code=codes.OVERRIDE,
1194-
)
1180+
self.note(" Setter types should behave contravariantly", defn, code=codes.OVERRIDE)
11951181

11961182
def signature_incompatible_with_supertype(
11971183
self,
@@ -3075,9 +3061,7 @@ def get_conflict_protocol_types(
30753061
different_setter = True
30763062
supertype = set_supertype
30773063
if IS_EXPLICIT_SETTER in get_member_flags(member, left):
3078-
set_subtype = mypy.typeops.get_protocol_member(
3079-
left, member, class_obj, is_lvalue=True
3080-
)
3064+
set_subtype = mypy.typeops.get_protocol_member(left, member, class_obj, is_lvalue=True)
30813065
if set_subtype != subtype:
30823066
different_setter = True
30833067
subtype = set_subtype

mypy/nodes.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,9 +1090,17 @@ def deserialize(cls, data: JsonDict) -> Var:
10901090
assert data[".class"] == "Var"
10911091
name = data["name"]
10921092
type = None if data["type"] is None else mypy.types.deserialize_type(data["type"])
1093-
setter_type = None if data["setter_type"] is None else mypy.types.deserialize_type(data["setter_type"])
1093+
setter_type = (
1094+
None
1095+
if data["setter_type"] is None
1096+
else mypy.types.deserialize_type(data["setter_type"])
1097+
)
10941098
v = Var(name, type)
1095-
assert setter_type is None or isinstance(setter_type, mypy.types.ProperType) and isinstance(setter_type, mypy.types.CallableType)
1099+
assert (
1100+
setter_type is None
1101+
or isinstance(setter_type, mypy.types.ProperType)
1102+
and isinstance(setter_type, mypy.types.CallableType)
1103+
)
10961104
v.setter_type = setter_type
10971105
v.is_ready = False # Override True default set in __init__
10981106
v._fullname = data["fullname"]

mypy/typeops.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,8 +1172,7 @@ def named_type(fullname: str) -> Instance:
11721172
NoneType()
11731173
if subtype.type is None
11741174
else Instance(
1175-
subtype.type,
1176-
[AnyType(TypeOfAny.unannotated)] * len(subtype.type.type_vars),
1175+
subtype.type, [AnyType(TypeOfAny.unannotated)] * len(subtype.type.type_vars)
11771176
)
11781177
)
11791178
return subtype

0 commit comments

Comments
 (0)