Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mypy/fastparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
WithStmt,
YieldExpr,
YieldFromExpr,
check_arg_names,
check_param_names,
)
from mypy.options import Options
from mypy.patterns import (
Expand Down Expand Up @@ -1115,7 +1115,7 @@ def transform_args(
new_args.append(self.make_argument(args.kwarg, None, ARG_STAR2, no_type_check))
names.append(args.kwarg)

check_arg_names([arg.variable.name for arg in new_args], names, self.fail_arg)
check_param_names([arg.variable.name for arg in new_args], names, self.fail_arg)

return new_args

Expand Down
4 changes: 2 additions & 2 deletions mypy/nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -5092,7 +5092,7 @@ def check_arg_kinds(
is_kw_arg = True


def check_arg_names(
def check_param_names(
names: Sequence[str | None],
nodes: list[T],
fail: Callable[[str, T], None],
Expand All @@ -5101,7 +5101,7 @@ def check_arg_names(
seen_names: set[str | None] = set()
for name, node in zip(names, nodes):
if name is not None and name in seen_names:
fail(f'Duplicate argument "{name}" in {description}', node)
fail(f'Duplicate parameter "{name}" in {description}', node)
break
seen_names.add(name)

Expand Down
4 changes: 2 additions & 2 deletions mypy/typeanal.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
TypeVarTupleExpr,
Var,
check_arg_kinds,
check_arg_names,
check_param_names,
)
from mypy.options import INLINE_TYPEDDICT, TYPE_FORM, Options
from mypy.plugin import AnalyzeTypeContext, Plugin, TypeAnalyzerPluginInterface
Expand Down Expand Up @@ -1712,7 +1712,7 @@ def analyze_callable_args(
kinds.append(ARG_STAR2 if second_unpack_last else ARG_STAR)
names.append(None)
# Note that arglist below is only used for error context.
check_arg_names(names, [arglist] * len(args), self.fail, "Callable")
check_param_names(names, [arglist] * len(args), self.fail, "Callable")
check_arg_kinds(kinds, [arglist] * len(args), self.fail)
return args, kinds, names

Expand Down
12 changes: 6 additions & 6 deletions test-data/unit/check-fastparse.test
Original file line number Diff line number Diff line change
Expand Up @@ -280,22 +280,22 @@ def f7(x: int): # E: Function has duplicate type signatures
def f(x, y, z):
pass

def g(x, y, x): # E: Duplicate argument "x" in function definition
def g(x, y, x): # E: Duplicate parameter "x" in function definition
pass

def h(x, y, *x): # E: Duplicate argument "x" in function definition
def h(x, y, *x): # E: Duplicate parameter "x" in function definition
pass

def i(x, y, *z, **z): # E: Duplicate argument "z" in function definition
def i(x, y, *z, **z): # E: Duplicate parameter "z" in function definition
pass

def j(x: int, y: int, *, x: int = 3): # E: Duplicate argument "x" in function definition
def j(x: int, y: int, *, x: int = 3): # E: Duplicate parameter "x" in function definition
pass

def k(*, y, z, y): # E: Duplicate argument "y" in function definition
def k(*, y, z, y): # E: Duplicate parameter "y" in function definition
pass

lambda x, y, x: ... # E: Duplicate argument "x" in function definition
lambda x, y, x: ... # E: Duplicate parameter "x" in function definition

[case testNoCrashOnImportFromStar]
from pack import *
Expand Down
2 changes: 1 addition & 1 deletion test-data/unit/check-functions.test
Original file line number Diff line number Diff line change
Expand Up @@ -1937,7 +1937,7 @@ def k(f: Callable[[KwArg(), NamedArg(Any, 'x')], int]): pass # E: A **kwargs arg
from typing import Callable
from mypy_extensions import Arg, VarArg, KwArg, DefaultArg

def f(f: Callable[[Arg(int, 'x'), int, Arg(int, 'x')], int]): pass # E: Duplicate argument "x" in Callable
def f(f: Callable[[Arg(int, 'x'), int, Arg(int, 'x')], int]): pass # E: Duplicate parameter "x" in Callable

[builtins fixtures/dict.pyi]

Expand Down