check function argument names for subtypes

Author: KotlinIsland

.mypy/baseline.json

@@ -1977,7 +1977,7 @@
         "code": "explicit-override",
         "column": 4,
         "message": "Method \"visit_class_def\" is not using @override but is overriding a method in class \"mypy.visitor.NodeVisitor\"",
-        "offset": 432,
+        "offset": 435,
         "src": "def visit_class_def(self, defn: ClassDef) -> None:",
         "target": "mypy.checker.TypeChecker.visit_class_def"
       },
@@ -2353,7 +2353,7 @@
         "code": "explicit-override",
         "column": 4,
         "message": "Method \"visit_uninhabited_type\" is not using @override but is overriding a method in class \"mypy.type_visitor.BoolTypeQuery\"",
-        "offset": 197,
+        "offset": 192,
         "src": "def visit_uninhabited_type(self, t: UninhabitedType) -> bool:",
         "target": "mypy.checker.InvalidInferredTypes.visit_uninhabited_type"
       },
@@ -10771,7 +10771,7 @@
         "code": "no-any-expr",
         "column": 67,
         "message": "Expression type contains \"Any\" (has type \"list[Any]\")",
-        "offset": 285,
+        "offset": 289,
         "src": "\"--package-root\", metavar=\"ROOT\", action=\"append\", default=[], help=argparse.SUPPRESS",
         "target": "mypy.main.process_options"
       },
@@ -11429,7 +11429,7 @@
         "code": "explicit-override",
         "column": 4,
         "message": "Method \"visit_unbound_type\" is not using @override but is overriding a method in class \"mypy.type_visitor.TypeVisitor\"",
-        "offset": 642,
+        "offset": 638,
         "src": "def visit_unbound_type(self, t: UnboundType) -> ProperType:",
         "target": "mypy.meet.TypeMeetVisitor.visit_unbound_type"
       },
@@ -14119,7 +14119,7 @@
         "code": "no-any-expr",
         "column": 18,
         "message": "Expression has type \"Any\"",
-        "offset": 122,
+        "offset": 125,
         "src": "MACHDEP = sysconfig.get_config_var(\"MACHDEP\")",
         "target": "mypy.options.Options.__init__"
       },
@@ -24737,7 +24737,7 @@
         "code": "no-any-explicit",
         "column": 4,
         "message": "Explicit \"Any\" is not allowed",
-        "offset": 749,
+        "offset": 747,
         "src": "def report(*args: Any) -> None:",
         "target": "mypy.subtypes.unify_generic_callable"
       },

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Narrow type on initial assignment (#547)
 - Annotations in function bodies are not analyzed as evaluated (#564)
 - Invalid `cast`s show an error (#573)
+- Argument names are validated for subtypes (#562)
 ### Enhancements
 - Show 'narrowed from' in `reveal_type` (#550)
 - `--color-output` is enabled by default (#531)

docs/source/based_features.rst

@@ -296,3 +296,15 @@ Basedmypy handles type annotations in function bodies as unevaluated:
 
     def f():
         a: list[int]  # no error, this annotation isn't evaluated
+
+Checked Argument Names
+----------------------
+
+.. code-block::python
+
+    class A:
+        def f(self, a: int): ...
+
+    class B(A):
+        @override
+        def f(self, b: int): ...  # error: Signature of "f" incompatible with supertype "A"

mypy/checker.py

@@ -2351,7 +2351,10 @@ def check_override(
         # Use boolean variable to clarify code.
         fail = False
         op_method_wider_note = False
-        if not is_subtype(override, original, ignore_pos_arg_names=True):
+
+        if not is_subtype(
+            override, original, ignore_pos_arg_names=self.options.work_not_properly_function_names
+        ):
             fail = True
         elif isinstance(override, Overloaded) and self.is_forward_op_method(name):
             # Operator method overrides cannot extend the domain, as
@@ -2837,7 +2840,7 @@ class C(B, A[int]): ...  # this is unsafe because...
             call = find_member("__call__", first_type, first_type, is_operator=True)
         if call and isinstance(second_type, FunctionLike):
             second_sig = self.bind_and_map_method(second, second_type, ctx, base2)
-            ok = is_subtype(call, second_sig, ignore_pos_arg_names=True)
+            ok = is_subtype(call, second_sig)
         elif isinstance(first_type, FunctionLike) and isinstance(second_type, FunctionLike):
             if first_type.is_type_obj() and second_type.is_type_obj():
                 # For class objects only check the subtype relationship of the classes,
@@ -2850,7 +2853,7 @@ class C(B, A[int]): ...  # this is unsafe because...
                 # First bind/map method types when necessary.
                 first_sig = self.bind_and_map_method(first, first_type, ctx, base1)
                 second_sig = self.bind_and_map_method(second, second_type, ctx, base2)
-                ok = is_subtype(first_sig, second_sig, ignore_pos_arg_names=True)
+                ok = is_subtype(first_sig, second_sig)
         elif first_type and second_type:
             if isinstance(first.node, Var):
                 first_type = expand_self_type(first.node, first_type, fill_typevars(ctx))
@@ -7754,12 +7757,7 @@ def is_more_general_arg_prefix(t: FunctionLike, s: FunctionLike) -> bool:
 
 def is_same_arg_prefix(t: CallableType, s: CallableType) -> bool:
     return is_callable_compatible(
-        t,
-        s,
-        is_compat=is_same_type,
-        ignore_return=True,
-        check_args_covariantly=True,
-        ignore_pos_arg_names=True,
+        t, s, is_compat=is_same_type, ignore_return=True, check_args_covariantly=True
     )
 
 

mypy/main.py

@@ -1139,6 +1139,10 @@ def add_invertible_flag(
     )
     # This undocumented feature exports limited line-level dependency information.
     internals_group.add_argument("--export-ref-info", action="store_true", help=argparse.SUPPRESS)
+    # This undocumented feature makes callable subtypes with incorrect names count as valid (needed to check mypy itself)
+    internals_group.add_argument(
+        "--work-not-properly-function-names", action="store_true", help=argparse.SUPPRESS
+    )
 
     report_group = parser.add_argument_group(
         title="Report generation", description="Generate a report in the specified format."

mypy/meet.py

@@ -467,11 +467,7 @@ def _type_object_overlap(left: Type, right: Type) -> bool:
 
     if isinstance(left, CallableType) and isinstance(right, CallableType):
         return is_callable_compatible(
-            left,
-            right,
-            is_compat=_is_overlapping_types,
-            ignore_pos_arg_names=True,
-            allow_partial_overlap=True,
+            left, right, is_compat=_is_overlapping_types, allow_partial_overlap=True
         )
     elif isinstance(left, CallableType):
         left = left.fallback

mypy/messages.py

@@ -3026,7 +3026,7 @@ def get_conflict_protocol_types(
         subtype = mypy.typeops.get_protocol_member(left, member, class_obj)
         if not subtype:
             continue
-        is_compat = is_subtype(subtype, supertype, ignore_pos_arg_names=True, options=options)
+        is_compat = is_subtype(subtype, supertype, options=options)
         if IS_SETTABLE in get_member_flags(member, right):
             is_compat = is_compat and is_subtype(supertype, subtype, options=options)
         if not is_compat:

mypy/options.py

@@ -105,6 +105,9 @@ class Options:
     """Options collected from flags."""
 
     def __init__(self) -> None:
+        # stupid thing to make mypy project check properly
+        self.work_not_properly_function_names = False
+
         # Cache for clone_for_module()
         self._per_module_cache: dict[str, Options] | None = None
         # Despite the warnings about _per_module_cache being slow, this one might be good

mypy/subtypes.py

@@ -1081,7 +1081,6 @@ def f(self) -> A: ...
         for member in right.type.protocol_members:
             if member in members_not_to_check:
                 continue
-            ignore_names = member != "__call__"  # __call__ can be passed kwargs
             # The third argument below indicates to what self type is bound.
             # We always bind self to the subtype. (Similarly to nominal types).
             supertype = get_proper_type(find_member(member, right, left))
@@ -1103,9 +1102,7 @@ def f(self) -> A: ...
                 # Nominal check currently ignores arg names
                 # NOTE: If we ever change this, be sure to also change the call to
                 # SubtypeVisitor.build_subtype_kind(...) down below.
-                is_compat = is_subtype(
-                    subtype, supertype, ignore_pos_arg_names=ignore_names, options=options
-                )
+                is_compat = is_subtype(subtype, supertype, options=options)
             else:
                 is_compat = is_proper_subtype(subtype, supertype)
             if not is_compat:
@@ -1141,6 +1138,7 @@ def f(self) -> A: ...
     if not proper_subtype:
         # Nominal check currently ignores arg names, but __call__ is special for protocols
         ignore_names = right.type.protocol_members != ["__call__"]
+        ignore_names = False
     else:
         ignore_names = False
     subtype_kind = SubtypeVisitor.build_subtype_kind(

mypy/typeshed/stdlib/_weakrefset.pyi

@@ -16,10 +16,10 @@ class WeakSet(MutableSet[_T], Generic[_T]):
     def __init__(self, data: None = None) -> None: ...
     @overload
     def __init__(self, data: Iterable[_T]) -> None: ...
-    def add(self, item: _T) -> None: ...
-    def discard(self, item: _T) -> None: ...
+    def add(self, item: _T) -> None: ...  # type: ignore[override]
+    def discard(self, item: _T) -> None: ...  # type: ignore[override]
     def copy(self) -> Self: ...
-    def remove(self, item: _T) -> None: ...
+    def remove(self, item: _T) -> None: ...  # type: ignore[override]
     def update(self, other: Iterable[_T]) -> None: ...
     def __contains__(self, item: object) -> bool: ...
     def __len__(self) -> int: ...

mypy/typeshed/stdlib/builtins.pyi

@@ -444,7 +444,7 @@ class str(Sequence[str]):
     def capitalize(self) -> str: ...  # type: ignore[misc]
     def casefold(self) -> str: ...  # type: ignore[misc]
     def center(self, __width: SupportsIndex, __fillchar: str = " ") -> str: ...  # type: ignore[misc]
-    def count(self, x: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
+    def count(self, x: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...  # type: ignore[override]
     def encode(self, encoding: str = "utf-8", errors: str = "strict") -> bytes: ...
     def endswith(
         self, __suffix: str | tuple[str, ...], __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...
@@ -457,7 +457,7 @@ class str(Sequence[str]):
     def find(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
     def format(self, *args: object, **kwargs: object) -> str: ...
     def format_map(self, map: _FormatMapMapping) -> str: ...
-    def index(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...
+    def index(self, __sub: str, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...) -> int: ...  # type: ignore[override]
     def isalnum(self) -> bool: ...
     def isalpha(self) -> bool: ...
     def isascii(self) -> bool: ...
@@ -533,7 +533,7 @@ class bytes(Sequence[int]):
     def __new__(cls) -> Self: ...
     def capitalize(self) -> bytes: ...
     def center(self, __width: SupportsIndex, __fillchar: bytes = b" ") -> bytes: ...
-    def count(
+    def count(  # type: ignore[override]
         self, __sub: ReadableBuffer | SupportsIndex, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...
     ) -> int: ...
     def decode(self, encoding: str = "utf-8", errors: str = "strict") -> str: ...
@@ -556,7 +556,7 @@ class bytes(Sequence[int]):
     else:
         def hex(self) -> str: ...
 
-    def index(
+    def index(  # type: ignore[override]
         self, __sub: ReadableBuffer | SupportsIndex, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...
     ) -> int: ...
     def isalnum(self) -> bool: ...
@@ -637,10 +637,10 @@ class bytearray(MutableSequence[int]):
     def __init__(self, __ints: Iterable[SupportsIndex] | SupportsIndex | ReadableBuffer) -> None: ...
     @overload
     def __init__(self, __string: str, encoding: str, errors: str = ...) -> None: ...
-    def append(self, __item: SupportsIndex) -> None: ...
+    def append(self, __item: SupportsIndex) -> None: ...  # type: ignore[override]
     def capitalize(self) -> bytearray: ...
     def center(self, __width: SupportsIndex, __fillchar: bytes = b" ") -> bytearray: ...
-    def count(
+    def count(  # type: ignore[override]
         self, __sub: ReadableBuffer | SupportsIndex, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...
     ) -> int: ...
     def copy(self) -> bytearray: ...
@@ -656,7 +656,7 @@ class bytearray(MutableSequence[int]):
     else:
         def expandtabs(self, tabsize: int = ...) -> bytearray: ...
 
-    def extend(self, __iterable_of_ints: Iterable[SupportsIndex]) -> None: ...
+    def extend(self, __iterable_of_ints: Iterable[SupportsIndex]) -> None: ...  # type: ignore[override]
     def find(
         self, __sub: ReadableBuffer | SupportsIndex, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...
     ) -> int: ...
@@ -665,10 +665,10 @@ class bytearray(MutableSequence[int]):
     else:
         def hex(self) -> str: ...
 
-    def index(
+    def index(  # type: ignore[override]
         self, __sub: ReadableBuffer | SupportsIndex, __start: SupportsIndex | None = ..., __end: SupportsIndex | None = ...
     ) -> int: ...
-    def insert(self, __index: SupportsIndex, __item: SupportsIndex) -> None: ...
+    def insert(self, __index: SupportsIndex, __item: SupportsIndex) -> None: ...  # type: ignore[override]
     def isalnum(self) -> bool: ...
     def isalpha(self) -> bool: ...
     def isascii(self) -> bool: ...
@@ -682,8 +682,8 @@ class bytearray(MutableSequence[int]):
     def lower(self) -> bytearray: ...
     def lstrip(self, __bytes: ReadableBuffer | None = None) -> bytearray: ...
     def partition(self, __sep: ReadableBuffer) -> tuple[bytearray, bytearray, bytearray]: ...
-    def pop(self, __index: int = -1) -> int: ...
-    def remove(self, __value: int) -> None: ...
+    def pop(self, __index: int = -1) -> int: ...  # type: ignore[override]
+    def remove(self, __value: int) -> None: ...  # type: ignore[override]
     if sys.version_info >= (3, 9):
         def removeprefix(self, __prefix: ReadableBuffer) -> bytearray: ...
         def removesuffix(self, __suffix: ReadableBuffer) -> bytearray: ...
@@ -881,8 +881,8 @@ class tuple(Sequence[_T_co], Generic[_T_co]):
     def __add__(self, __value: tuple[_T, ...]) -> tuple[_T_co | _T, ...]: ...
     def __mul__(self, __value: SupportsIndex) -> tuple[_T_co, ...]: ...
     def __rmul__(self, __value: SupportsIndex) -> tuple[_T_co, ...]: ...
-    def count(self, __value: Any) -> int: ...
-    def index(self, __value: Any, __start: SupportsIndex = 0, __stop: SupportsIndex = sys.maxsize) -> int: ...
+    def count(self, __value: Any) -> int: ...  # type: ignore[override]
+    def index(self, __value: Any, __start: SupportsIndex = 0, __stop: SupportsIndex = sys.maxsize) -> int: ...  # type: ignore[override]
     if sys.version_info >= (3, 9):
         def __class_getitem__(cls, __item: Any) -> GenericAlias: ...
 
@@ -918,15 +918,15 @@ class list(MutableSequence[_T], Generic[_T]):
     @overload
     def __init__(self, __iterable: Iterable[_T]) -> None: ...
     def copy(self) -> list[_T]: ...
-    def append(self, __object: _T) -> None: ...
-    def extend(self, __iterable: Iterable[_T]) -> None: ...
-    def pop(self, __index: SupportsIndex = -1) -> _T: ...
+    def append(self, __object: _T) -> None: ...  # type: ignore[override]
+    def extend(self, __iterable: Iterable[_T]) -> None: ...  # type: ignore[override]
+    def pop(self, __index: SupportsIndex = -1) -> _T: ...  # type: ignore[override]
     # Signature of `list.index` should be kept in line with `collections.UserList.index()`
     # and multiprocessing.managers.ListProxy.index()
-    def index(self, __value: _T, __start: SupportsIndex = 0, __stop: SupportsIndex = sys.maxsize) -> int: ...
-    def count(self, __value: _T) -> int: ...
-    def insert(self, __index: SupportsIndex, __object: _T) -> None: ...
-    def remove(self, __value: _T) -> None: ...
+    def index(self, __value: _T, __start: SupportsIndex = 0, __stop: SupportsIndex = sys.maxsize) -> int: ...  # type: ignore[override]
+    def count(self, __value: _T) -> int: ...  # type: ignore[override]
+    def insert(self, __index: SupportsIndex, __object: _T) -> None: ...  # type: ignore[override]
+    def remove(self, __value: _T) -> None: ...  # type: ignore[override]
     # Signature of `list.sort` should be kept inline with `collections.UserList.sort()`
     # and multiprocessing.managers.ListProxy.sort()
     #
@@ -1009,7 +1009,7 @@ class dict(MutableMapping[_KT, _VT], Generic[_KT, _VT]):
     def get(self, __key: _KT, __default: _VT) -> _VT: ...
     @overload
     def get(self, __key: _KT, __default: _T) -> _VT | _T: ...
-    @overload
+    @overload  # type: ignore[override]
     def pop(self, __key: _KT) -> _VT: ...
     @overload
     def pop(self, __key: _KT, __default: _VT) -> _VT: ...
@@ -1045,17 +1045,17 @@ class set(MutableSet[_T], Generic[_T]):
     def __init__(self) -> None: ...
     @overload
     def __init__(self, __iterable: Iterable[_T]) -> None: ...
-    def add(self, __element: _T) -> None: ...
+    def add(self, __element: _T) -> None: ...  # type: ignore[override]
     def copy(self) -> set[_T]: ...
     def difference(self, *s: Iterable[Any]) -> set[_T]: ...
     def difference_update(self, *s: Iterable[Any]) -> None: ...
-    def discard(self, __element: _T) -> None: ...
+    def discard(self, __element: _T) -> None: ...  # type: ignore[override]
     def intersection(self, *s: Iterable[Any]) -> set[_T]: ...
     def intersection_update(self, *s: Iterable[Any]) -> None: ...
-    def isdisjoint(self, __s: Iterable[Any]) -> bool: ...
+    def isdisjoint(self, __s: Iterable[Any]) -> bool: ...  # type: ignore[override]
     def issubset(self, __s: Iterable[Any]) -> bool: ...
     def issuperset(self, __s: Iterable[Any]) -> bool: ...
-    def remove(self, __element: _T) -> None: ...
+    def remove(self, __element: _T) -> None: ...  # type: ignore[override]
     def symmetric_difference(self, __s: Iterable[_T]) -> set[_T]: ...
     def symmetric_difference_update(self, __s: Iterable[_T]) -> None: ...
     def union(self, *s: Iterable[_S]) -> set[_T | _S]: ...
@@ -1088,7 +1088,7 @@ class frozenset(AbstractSet[_T_co], Generic[_T_co]):
     def copy(self) -> frozenset[_T_co]: ...
     def difference(self, *s: Iterable[object]) -> frozenset[_T_co]: ...
     def intersection(self, *s: Iterable[object]) -> frozenset[_T_co]: ...
-    def isdisjoint(self, __s: Iterable[_T_co]) -> bool: ...
+    def isdisjoint(self, __s: Iterable[_T_co]) -> bool: ...  # type: ignore[override]
     def issubset(self, __s: Iterable[object]) -> bool: ...
     def issuperset(self, __s: Iterable[object]) -> bool: ...
     def symmetric_difference(self, __s: Iterable[_T_co]) -> frozenset[_T_co]: ...
@@ -1128,7 +1128,7 @@ class range(Sequence[int]):
     def __init__(self, __stop: SupportsIndex) -> None: ...
     @overload
     def __init__(self, __start: SupportsIndex, __stop: SupportsIndex, __step: SupportsIndex = ...) -> None: ...
-    def count(self, __value: int) -> int: ...
+    def count(self, __value: int) -> int: ...  # type: ignore[override]
     def index(self, __value: int) -> int: ...  # type: ignore[override]
     def __len__(self) -> int: ...
     def __eq__(self, __value: object) -> bool: ...