diff --git a/mypy/checker.py b/mypy/checker.py index 2c15970b8b150..0e4cff2d4a73b 100644 --- a/mypy/checker.py +++ b/mypy/checker.py @@ -781,7 +781,6 @@ def extract_callable_type(self, inner_type: Type | None, ctx: Context) -> Callab is_lvalue=False, is_super=False, is_operator=True, - msg=self.msg, original_type=inner_type, chk=self, ) @@ -4736,7 +4735,6 @@ def check_member_assignment( original_type=instance_type, context=context, self_type=None, - msg=self.msg, chk=self, ) get_type = analyze_descriptor_access(attribute_type, mx, assignment=True) @@ -6746,7 +6744,6 @@ def replay_lookup(new_parent_type: ProperType) -> Type | None: is_lvalue=False, is_super=False, is_operator=False, - msg=self.msg, original_type=new_parent_type, chk=self, in_literal_context=False, @@ -8044,7 +8041,6 @@ def has_valid_attribute(self, typ: Type, name: str) -> bool: is_lvalue=False, is_super=False, is_operator=False, - msg=self.msg, original_type=typ, chk=self, # This is not a real attribute lookup so don't mess with deferring nodes. diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py index 80471a04469cb..bda04f7c68c4c 100644 --- a/mypy/checkexpr.py +++ b/mypy/checkexpr.py @@ -1505,7 +1505,6 @@ def check_union_call_expr(self, e: CallExpr, object_type: UnionType, member: str is_lvalue=False, is_super=False, is_operator=False, - msg=self.msg, original_type=object_type, chk=self.chk, in_literal_context=self.is_literal_context(), @@ -1593,7 +1592,6 @@ def check_call( is_lvalue=False, is_super=False, is_operator=True, - msg=self.msg, original_type=original_type or callee, chk=self.chk, in_literal_context=self.is_literal_context(), @@ -3353,7 +3351,6 @@ def analyze_ordinary_member_access(self, e: MemberExpr, is_lvalue: bool) -> Type is_lvalue=is_lvalue, is_super=False, is_operator=False, - msg=self.msg, original_type=original_type, chk=self.chk, in_literal_context=self.is_literal_context(), @@ -3377,7 +3374,6 @@ def analyze_external_member_access( is_lvalue=False, is_super=False, is_operator=False, - msg=self.msg, original_type=base_type, chk=self.chk, in_literal_context=self.is_literal_context(), @@ -3872,7 +3868,6 @@ def check_method_call_by_name( is_lvalue=False, is_super=False, is_operator=True, - msg=self.msg, original_type=original_type, self_type=base_type, chk=self.chk, @@ -3967,7 +3962,6 @@ def lookup_operator(op_name: str, base_type: Type) -> Type | None: is_operator=True, original_type=base_type, context=context, - msg=self.msg, chk=self.chk, in_literal_context=self.is_literal_context(), ) @@ -5568,7 +5562,6 @@ def visit_super_expr(self, e: SuperExpr) -> Type: original_type=instance_type, override_info=base, context=e, - msg=self.msg, chk=self.chk, in_literal_context=self.is_literal_context(), ) diff --git a/mypy/checkmember.py b/mypy/checkmember.py index 0994d0df400b5..bda1e71b40c74 100644 --- a/mypy/checkmember.py +++ b/mypy/checkmember.py @@ -95,7 +95,6 @@ def __init__( is_operator: bool, original_type: Type, context: Context, - msg: MessageBuilder, chk: mypy.checker.TypeChecker, self_type: Type | None, module_symbol_table: SymbolTable | None = None, @@ -108,8 +107,8 @@ def __init__( self.original_type = original_type self.self_type = self_type or original_type self.context = context # Error context - self.msg = msg self.chk = chk + self.msg = chk.msg self.module_symbol_table = module_symbol_table self.no_deferral = no_deferral self.is_self = is_self @@ -123,7 +122,6 @@ def not_ready_callback(self, name: str, context: Context) -> None: def copy_modified( self, *, - messages: MessageBuilder | None = None, self_type: Type | None = None, is_lvalue: bool | None = None, original_type: Type | None = None, @@ -134,14 +132,11 @@ def copy_modified( is_operator=self.is_operator, original_type=self.original_type, context=self.context, - msg=self.msg, chk=self.chk, self_type=self.self_type, module_symbol_table=self.module_symbol_table, no_deferral=self.no_deferral, ) - if messages is not None: - mx.msg = messages if self_type is not None: mx.self_type = self_type if is_lvalue is not None: @@ -159,7 +154,6 @@ def analyze_member_access( is_lvalue: bool, is_super: bool, is_operator: bool, - msg: MessageBuilder, original_type: Type, chk: mypy.checker.TypeChecker, override_info: TypeInfo | None = None, @@ -198,7 +192,6 @@ def analyze_member_access( is_operator=is_operator, original_type=original_type, context=context, - msg=msg, chk=chk, self_type=self_type, module_symbol_table=module_symbol_table, diff --git a/mypy/checkpattern.py b/mypy/checkpattern.py index 2a8620482d878..c71d833246947 100644 --- a/mypy/checkpattern.py +++ b/mypy/checkpattern.py @@ -598,7 +598,6 @@ def visit_class_pattern(self, o: ClassPattern) -> PatternType: is_lvalue=False, is_super=False, is_operator=False, - msg=self.msg, original_type=typ, chk=self.chk, ) @@ -664,7 +663,6 @@ def visit_class_pattern(self, o: ClassPattern) -> PatternType: is_lvalue=False, is_super=False, is_operator=False, - msg=self.msg, original_type=new_type, chk=self.chk, )