Skip to content

gh-117613: Argument Clinic: ensure that defining_class params are positional-only #117781

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 7 commits into from
Apr 16, 2024
Merged

gh-117613: Argument Clinic: ensure that defining_class params are positional-only #117781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d6ec560
ensure defining_class is positional only
neonene Apr 11, 2024
ee1a93d
update Modules/_sqlite/clinic/connection.c.h
neonene Apr 15, 2024
38afc57
Merge branch 'main' into ackind
neonene Apr 15, 2024
3cd8b03
correct a test case
neonene Apr 16, 2024
67db06a
Merge branch 'python:main' into ackind
neonene Apr 16, 2024
9fed4f0
regen clinic cheksums
neonene Apr 16, 2024
ff59596
Merge branch 'main' into ackind
erlend-aasland Apr 16, 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
10 changes: 10 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 @@ -2508,6 +2508,16 @@ def test_state_func_docstring_only_one_param_template(self):
"""
self.expect_failure(block, err, lineno=7)

def test_kind_defining_class(self):
function = self.parse_function("""
module m
class m.C "PyObject *" ""
m.C.meth
cls: defining_class
""", signatures_in_block=3, function_index=2)
p = function.parameters['cls']
self.assertEqual(p.kind, inspect.Parameter.POSITIONAL_ONLY)


class ClinicExternalTest(TestCase):
maxDiff = None
Expand Down
8 changes: 4 additions & 4 deletions Modules/_sqlite/clinic/connection.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Modules/clinic/_testclinic.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 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,7 @@ 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.")
kind = inspect.Parameter.POSITIONAL_ONLY
else:
fail("A 'defining_class' parameter, if specified, must either "
"be the first thing in the parameter block, or come just "
Expand Down