Skip to content

gh-112205: Require @getter and @setter to be methods #113278

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 6 commits into from
Dec 19, 2023
Merged

gh-112205: Require @getter and @setter to be methods #113278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b4a1f7
gh-112205: Require @getter and @setter to be class methods
erlend-aasland Dec 19, 2023
528adc2
Update Tools/clinic/clinic.py
erlend-aasland Dec 19, 2023
e0a3f6a
Update Tools/clinic/clinic.py
erlend-aasland Dec 19, 2023
45a2e32
Sync with main
erlend-aasland Dec 19, 2023
fefab17
Sync with PR
erlend-aasland Dec 19, 2023
0aebce8
Add test
erlend-aasland Dec 19, 2023
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
11 changes: 11 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 @@ -2249,6 +2249,17 @@ class Foo "" ""
expected_error = "Cannot apply both @getter and @setter to the same function!"
self.expect_failure(block, expected_error, lineno=3)

def test_getset_no_class(self):
for annotation in "@getter", "@setter":
with self.subTest(annotation=annotation):
block = f"""
module m
{annotation}
m.func
"""
expected_error = "@getter and @setter must be methods"
self.expect_failure(block, expected_error, lineno=2)

def test_duplicate_coexist(self):
err = "Called @coexist twice"
block = """
Expand Down
4 changes: 4 additions & 0 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5614,6 +5614,10 @@ def state_modulename_name(self, line: str) -> None:
function_name = fields.pop()
module, cls = self.clinic._module_and_class(fields)

if self.kind in {GETTER, SETTER}:
if not cls:
fail("@getter and @setter must be methods")

self.update_function_kind(full_name)
if self.kind is METHOD_INIT and not return_converter:
return_converter = init_return_converter()
Expand Down