@@ -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
87988795def get_raw_setter_type (defn : OverloadedFuncDef | Var ) -> ProperType :
0 commit comments