8000 Reject invalid ParamSpec locations by sterliakov · Pull Request #18278 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Reject invalid ParamSpec locations #18278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 2, 2025
Merged

Reject invalid ParamSpec locations #18278

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ab6f17e
Add compliance test, stop ignoring some weird paramspec positions
sterliakov Dec 11, 2024
6ef6d89
Move ParamSpec validity checks to typeanal entirely
sterliakov Dec 11, 2024
5d9d703
Remove "special" treatment for ParamSpec parts encountered during ana…
sterliakov Dec 11, 2024
d461ba2
Fix broken `Callable[[Unpack[SomeTypedDict]], None]`
sterliakov Dec 11, 2024
dfa0887
Recover Unpack sanity checks
sterliakov Dec 11, 2024
643a0db
Fix runtime crash in prefect, clean up naming
sterliakov Dec 11, 2024
caeb13e
Merge branch 'master' into bugfix/st-paramspec-locations
sterliakov Dec 20, 2024
c8204ed
Remove an non-conformant old test, move the problematic part of it to…
sterliakov Jan 2, 2025
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
Prev Previous commit
Next Next commit
Fix runtime crash in prefect, clean up naming
  • Loading branch information
@sterliakov
sterliakov committed Dec 11, 2024
commit 643a0dbd2ef782d9bca96af0370736e79f42bbbe
45 changes: 28 additions & 17 deletions mypy/typeanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,14 +304,14 @@ def not_declared_in_type_params(self, tvar_name: str) -> bool:

def visit_unbound_type_nonoptional(self, t: UnboundType, defining_literal: bool) -> Type:
sym = self.lookup_qualified(t.name, t)
paramspec_name = None
param_spec_name = None
if t.name.endswith((".args", ".kwargs")):
paramspec_name = t.name.rsplit(".", 1)[0]
maybe_pspec = self.lookup_qualified(paramspec_name, t)
if maybe_pspec and isinstance(maybe_pspec.node, ParamSpecExpr):
sym = maybe_pspec
param_spec_name = t.name.rsplit(".", 1)[0]
maybe_param_spec = self.lookup_qualified(param_spec_name, t)
if maybe_param_spec and isinstance(maybe_param_spec.node, ParamSpecExpr):
sym = maybe_param_spec
else:
paramspec_name = None
param_spec_name = None

if sym is not None:
node = sym.node
Expand Down Expand Up @@ -365,7 +365,7 @@ def visit_unbound_type_nonoptional(self, t: UnboundType, defining_literal: bool)
if tvar_def is None:
if self.allow_unbound_tvars:
return t
name = paramspec_name or t.name
name = param_spec_name or t.name
if self.defining_alias and self.not_declared_in_type_params(t.name):
msg = f'ParamSpec "{name}" is not included in type_params'
else:
Expand All @@ -377,7 +377,7 @@ def visit_unbound_type_nonoptional(self, t: UnboundType, defining_literal: bool)
self.fail(
f'ParamSpec "{t.name}" used with arguments', t, code=codes.VALID_TYPE
)
if paramspec_name is not None and not self.allow_param_spec_literals:
if param_spec_name is not None and not self.allow_param_spec_literals:
self.fail(
"ParamSpec components are not allowed here", t, code=codes.VALID_TYPE
)
Expand Down Expand Up @@ -1110,20 +1110,25 @@ def visit_callable_type(

arg_kinds = t.arg_kinds
arg_types = []
pspec_with_args = pspec_with_kwargs = None
for i, ut in enumerate(t.arg_types):
kind = arg_kinds[i]
param_spec_with_args = param_spec_with_kwargs = None
param_spec_invalid = False
for kind, ut in zip(arg_kinds, t.arg_types):
if kind == ARG_STAR:
pspec_with_args, at = self.anal_star_arg_type(ut, kind, nested=nested)
param_spec_with_args, at = self.anal_star_arg_type(ut, kind, nested=nested)
elif kind == ARG_STAR2:
pspec_with_kwargs, at = self.anal_star_arg_type(ut, kind, nested=nested)
param_spec_with_kwargs, at = self.anal_star_arg_type(ut, kind, nested=nested)
else:
if pspec_with_args:
self.fail("Arguments not allowed after ParamSpec.args", t)
if param_spec_with_args:
param_spec_invalid = True
self.fail(
"Arguments not allowed after ParamSpec.args", t, code=codes.VALID_TYPE
)
at = self.anal_type(ut, nested=nested, allow_unpack=False)
arg_types.append(at)

if nested and arg_types:
# If we've got a Callable[[Unpack[SomeTypedDict]], None], make sure
# Unpack is interpreted as `**` and not as `*`.
last = arg_types[-1]
if isinstance(last, UnpackType):
# TODO: it would be better to avoid this get_proper_type() call.
Expand All @@ -1136,12 +1141,18 @@ def visit_callable_type(
unpacked_kwargs = True
arg_types = self.check_unpacks_in_list(arg_types)

if pspec_with_args != pspec_with_kwargs:
name = pspec_with_args or pspec_with_kwargs
if not param_spec_invalid and param_spec_with_args != param_spec_with_kwargs:
# If already invalid, do not report more errors - definition has
# to be fixed anyway
name = param_spec_with_args or param_spec_with_kwargs
self.fail(
f'ParamSpec must have "*args" typed as "{name}.args" and "**kwargs" typed as "{name}.kwargs"',
t,
code=codes.VALID_TYPE,
)
param_spec_invalid = True

if param_spec_invalid:
if ARG_STAR in arg_kinds:
arg_types[arg_kinds.index(ARG_STAR)] = AnyType(TypeOfAny.from_error)
if ARG_STAR2 in arg_kinds:
Expand Down
8 changes: 4 additions & 4 deletions test-data/unit/check-parameter-specification.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,13 +454,13 @@ class C(Generic[P, P2]):
def m1(self, *args: P.args, **kwargs: P.kwargs) -> None:
self.m1(*args, **kwargs)
self.m2(*args, **kwargs) # E: Argument 1 to "m2" of "C" has incompatible type "*P.args"; expected "P2.args" \
# E: Argument 2 to "m2" of "C" has incompatible type "**P.kwargs"; expected "P2.kwargs"
# E: Argument 2 to "m2" of "C" has incompatible type "**P.kwargs"; expected "P2.kwargs"
self.m1(*kwargs, **args) # E: Argument 1 to "m1" of "C" has incompatible type "*P.kwargs"; expected "P.args" \
# E: Argument 2 to "m1" of "C" has incompatible type "**P.args"; expected "P.kwargs"
# E: Argument 2 to "m1" of "C" has incompatible type "**P.args"; expected "P.kwargs"
self.m3(*args, **kwargs) # E: Argument 1 to "m3" of "C" has incompatible type "*P.args"; expected "int" \
# E: Argument 2 to "m3" of "C" has incompatible type "**P.kwargs"; expected "int"
# E: Argument 2 to "m3" of "C" has incompatible type "**P.kwargs"; expected "int"
self.m4(*args, **kwargs) # E: Argument 1 to "m4" of "C" has incompatible type "*P.args"; expected "int" \
# E: Argument 2 to "m4" of "C" has incompatible type "**P.kwargs"; expected "int"
# E: Argument 2 to "m4" of "C" has incompatible type "**P.kwargs"; expected "int"

self.m1(*args, **args) # E: Argument 2 to "m1" of "C" has incompatible type "**P.args"; expected "P.kwargs"
self.m1(*kwargs, **kwargs) # E: Argument 1 to "m1" of "C" has incompatible type "*P.kwargs"; expected "P.args"
Expand Down
Loading
0