refactor: merge check_deprecated_function and check_deprecated_class into one method (check_deprecated)

Author: tyralla

mypy/checker.py

@@ -2954,7 +2954,7 @@ def visit_assignment_stmt(self, s: AssignmentStmt) -> None:
                     and isinstance(var := lvalue.node, Var)
                     and isinstance(instance := get_proper_type(var.type), Instance)
                 ):
-                    self.check_deprecated_class(instance.type, s)
+                    self.check_deprecated(instance.type, s)
 
         # Avoid type checking type aliases in stubs to avoid false
         # positives about modern type syntax available in stubs such
@@ -7596,14 +7596,8 @@ def get_deprecation_warning(
             return f"{name} is deprecated: {deprecation}"
         return f"{name} is deprecated [overload {typ}]: {deprecation}"
 
-    def check_deprecated_function(self, typ: Type, context: Context) -> None:
-        if isinstance(typ := get_proper_type(typ), (CallableType, Overloaded)):
-            self._check_deprecated(typ, context)
-
-    def check_deprecated_class(self, typ: TypeInfo, context: Context) -> None:
-        self._check_deprecated(typ, context)
-
-    def _check_deprecated(self, typ: CallableType | Overloaded | TypeInfo, context: Context) -> None:
+    def check_deprecated(self, typ: CallableType | Overloaded | TypeInfo, context: Context) -> None:
+        """Warn if deprecated and not directly imported with a `from` statement."""
         if typ.deprecated is not None:
             for imp in self.tree.imports:
                 if isinstance(imp, ImportFrom) and any(typ.name == n[0] for n in imp.names):
@@ -7614,6 +7608,7 @@ def _check_deprecated(self, typ: CallableType | Overloaded | TypeInfo, context:
     def warn_deprecated(
         self, typ: CallableType | Overloaded | TypeInfo, context: Context
     ) -> None:
+        """Warn if deprecated."""
         if (deprecated := typ.deprecated) is not None:
             warn = self.msg.fail if self.options.report_deprecated_as_error else self.msg.note
             warn(deprecated, context, code=codes.DEPRECATED)

mypy/checkexpr.py

@@ -356,9 +356,9 @@ def visit_name_expr(self, e: NameExpr) -> Type:
         result = self.analyze_ref_expr(e)
         narrowed = self.narrow_type_from_binder(e, result)
         if isinstance(e.node, TypeInfo):
-            self.chk.check_deprecated_class(e.node, e)
-        else:
-            self.chk.check_deprecated_function(narrowed, e)
+            self.chk.check_deprecated(e.node, e)
+        elif isinstance(typ := get_proper_type(narrowed), (CallableType, Overloaded)):
+            self.chk.check_deprecated(typ, e)
         return narrowed
 
     def analyze_ref_expr(self, e: RefExpr, lvalue: bool = False) -> Type:
@@ -1479,8 +1479,9 @@ def check_call_expr_with_callee_type(
             callable_name=callable_name,
             object_type=object_type,
         )
-        self.chk.check_deprecated_function(callee_type, e)
         proper_callee = get_proper_type(callee_type)
+        if isinstance(proper_callee, (CallableType, Overloaded)):
+            self.chk.check_deprecated(proper_callee, e)
         if isinstance(e.callee, RefExpr) and isinstance(proper_callee, CallableType):
             # Cache it for find_isinstance_check()
             if proper_callee.type_guard is not None:
@@ -3488,7 +3489,8 @@ def visit_op_expr(self, e: OpExpr) -> Type:
             else:
                 assert_never(use_reverse)
             e.method_type = method_type
-            self.chk.check_deprecated_function(method_type, e)
+            if isinstance(mt := get_proper_type(method_type), (CallableType, Overloaded)):
+                self.chk.check_deprecated(mt, e)
             return result
         else:
             raise RuntimeError(f"Unknown operator {e.op}")