Jan 12, 2024 · Jan 5, 2024 · Jan 6, 2024 · Jan 12, 2024
diff --git a/mypy/stubtest.py b/mypy/stubtest.py
                # argument. To accomplish this, we just make up a fake index-based name.
                name = (
                    f"__{index}"
                    if arg.variable.name.startswith("__") or assume_positional_only
                    if arg.variable.name.startswith("__")
                    or arg.pos_only
                    or assume_positional_only
                    or arg.variable.name.strip("_") == "self"
                    else arg.variable.name
                )
                all_args.setdefault(name, []).append((arg, index))
                type_annotation=None,
                initializer=None,
                kind=get_kind(arg_name),
                pos_only=all(arg.pos_only for arg, _ in all_args[arg_name]),
            )
            if arg.kind.is_positional():
                sig.pos.append(arg)
        if (
            runtime_arg.kind != inspect.Parameter.POSITIONAL_ONLY
            and (stub_arg.pos_only or stub_arg.variable.name.startswith("__"))
            and stub_arg.variable.name.strip("_") != "self"
            and not is_dunder(function_name, exclude_special=True)  # noisy for dunder methods
        ):
            yield (
diff --git a/mypy/test/teststubtest.py b/mypy/test/teststubtest.py
        )

        actual_errors = set(output.splitlines())
        assert actual_errors == expected_errors, output
        if actual_errors != expected_errors:
            output = run_stubtest(
                stub="\n\n".join(textwrap.dedent(c.stub.lstrip("\n")) for c in cases),
                runtime="\n\n".join(textwrap.dedent(c.runtime.lstrip("\n")) for c in cases),
                options=[],
            )
            assert actual_errors == expected_errors, output

    return test

            """,
            error=None,
        )
        yield Case(
            stub="""
            @overload
            def f7(a: int, /) -> int: ...
            @overload
            def f7(b: str, /) -> str: ...
            """,
            runtime="def f7(x, /): pass",
            error=None,
        )
        yield Case(
            stub="""
            @overload
            def f8(a: int, c: int = 0, /) -> int: ...
            @overload
            def f8(b: str, d: int, /) -> str: ...
            """,
            runtime="def f8(x, y, /): pass",
            error="f8",
        )
        yield Case(
            stub="""
            @overload
            def f9(a: int, c: int = 0, /) -> int: ...
            @overload
            def f9(b: str, d: int, /) -> str: ...
            """,
            runtime="def f9(x, y=0, /): pass",
            error=None,
        )
        yield Case(
            stub="""
            class Bar:
                @overload
                def f1(self) -> int: ...
                @overload
                def f1(self, a: int, /) -> int: ...

                @overload
                def f2(self, a: int, /) -> int: ...
                @overload
                def f2(self, a: str, /) -> int: ...
            """,
            runtime="""
            class Bar:
                def f1(self, *a) -> int: ...
                def f2(self, *a) -> int: ...
            """,
            error=None,
        )

    @collect_cases
    def test_property(self) -> Iterator[Case]:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -828,7 +828,10 @@ def from_overloadedfuncdef(stub: nodes.OverloadedFuncDef) -> Signature[nodes.Arg
		# argument. To accomplish this, we just make up a fake index-based name.
		name = (
		f"__{index}"
		if arg.variable.name.startswith("__") or assume_positional_only
		if arg.variable.name.startswith("__")
		or arg.pos_only
		or assume_positional_only
		or arg.variable.name.strip("_") == "self"
		else arg.variable.name
		)
		all_args.setdefault(name, []).append((arg, index))
Expand DownExpand Up		@@ -872,6 +875,7 @@ def get_kind(arg_name: str) -> nodes.ArgKind:
		type_annotation=None,
		initializer=None,
		kind=get_kind(arg_name),
		pos_only=all(arg.pos_only for arg, _ in all_args[arg_name]),
		)
		if arg.kind.is_positional():
		sig.pos.append(arg)
Expand DownExpand Up		@@ -907,6 +911,7 @@ def _verify_signature(
		if (
		runtime_arg.kind != inspect.Parameter.POSITIONAL_ONLY
		and (stub_arg.pos_only or stub_arg.variable.name.startswith("__"))
		and stub_arg.variable.name.strip("_") != "self"
		and not is_dunder(function_name, exclude_special=True) # noisy for dunder methods
		):
		yield (
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -210,7 +210,13 @@ def test(args: Any, *kwargs: Any) -> None:
		)

		actual_errors = set(output.splitlines())
		assert actual_errors == expected_errors, output
		if actual_errors != expected_errors:
		output = run_stubtest(
		stub="\n\n".join(textwrap.dedent(c.stub.lstrip("\n")) for c in cases),
		runtime="\n\n".join(textwrap.dedent(c.runtime.lstrip("\n")) for c in cases),
		options=[],
		)
		assert actual_errors == expected_errors, output

		return test

Expand DownExpand Up		@@ -660,6 +666,56 @@ def f6(self, x, /): pass
		""",
		error=None,
		)
		yield Case(
		stub="""
		@overload
		def f7(a: int, /) -> int: ...
		@overload
		def f7(b: str, /) -> str: ...
		""",
		runtime="def f7(x, /): pass",
		error=None,
		)
		yield Case(
		stub="""
		@overload
		def f8(a: int, c: int = 0, /) -> int: ...
		@overload
		def f8(b: str, d: int, /) -> str: ...
		""",
		runtime="def f8(x, y, /): pass",
		error="f8",
		)
		yield Case(
		stub="""
		@overload
		def f9(a: int, c: int = 0, /) -> int: ...
		@overload
		def f9(b: str, d: int, /) -> str: ...
		""",
		runtime="def f9(x, y=0, /): pass",
		error=None,
		)
		yield Case(
		stub="""
		class Bar:
		@overload
		def f1(self) -> int: ...
Copy link CollaboratorAuthor hauntsaninjaJan 12, 2024• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. We have instances of this inpython/typeshed#11250, I don't think it's worth having stubtest complain that this isn't positional-only, at least for now
		@overload
		def f1(self, a: int, /) -> int: ...

		@overload
		def f2(self, a: int, /) -> int: ...
		@overload
		def f2(self, a: str, /) -> int: ...
		""",
		runtime="""
		class Bar:
		def f1(self, *a) -> int: ...
		def f2(self, *a) -> int: ...
		""",
		error=None,
		)

		@collect_cases
		def test_property(self) -> Iterator[Case]:
Expand Down