Skip to content

gh-117613: Argument Clinic: disallow defining_class parameter at module level #117950

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
erlend-aasland merged 8 commits into from
Apr 17, 2024
+11 −0
Merged

gh-117613: Argument Clinic: disallow defining_class parameter at module level #117950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
074f1cb
disallow defining_class inside a module block
neonene Apr 16, 2024
0db2507
correct error msg
neonene Apr 16, 2024
022db2b
correct test name
neonene Apr 16, 2024
952e436
suppress a mypy error
neonene Apr 17, 2024
dc2e4aa
Merge branch 'main' into ac313
neonene Apr 17, 2024
f7bb2ca
Merge branch 'main' into ac313
neonene Apr 17, 2024
73bbdfc
simplify the check
neonene Apr 17, 2024
0f5ceff
Merge branch 'main' into ac313
neonene Apr 17, 2024
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
9 changes: 9 additions & 0 deletions Lib/test/test_clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2518,6 +2518,15 @@ class m.C "PyObject *" ""
p = function.parameters['cls']
self.assertEqual(p.kind, inspect.Parameter.POSITIONAL_ONLY)

def test_disallow_defining_class_at_module_level(self):
err = "A 'defining_class' parameter cannot be defined at module level."
block = """
module m
m.func
cls: defining_class
"""
self.expect_failure(block, err, lineno=2)


class ClinicExternalTest(TestCase):
maxDiff = None
Expand Down
2 changes: 2 additions & 0 deletions Tools/clinic/libclinic/dsl_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,6 +1102,8 @@ def bad_node(self, node: ast.AST) -> None:
fail("A 'defining_class' parameter cannot have a default value.")
if self.group:
fail("A 'defining_class' parameter cannot be in an optional group.")
if self.function.cls is None:
fail("A 'defining_class' parameter cannot be defined at module level.")
kind = inspect.Parameter.POSITIONAL_ONLY
else:
fail("A 'defining_class' parameter, if specified, must either "
Expand Down