Skip to content

gh-90562: Fix super() without args calls for dataclasses with slots #111538

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

Open
sobolevn wants to merge 4 commits into
base: main
Choose a base branch
from
Open

gh-90562: Fix super() without args calls for dataclasses with slots #111538

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d310165
gh-111500: Fix `super()` without args calls for `dataclasses` with slots
sobolevn Oct 31, 2023
0fdf155
Merge branch 'main' into issue-111500
sobolevn Mar 12, 2024
ee3edbf
Looks like we don't need to unwrap anything
sobolevn Mar 12, 2024
6dae168
Address review
sobolevn Mar 12, 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
Prev Previous commit
Address review
  • Loading branch information
@sobolevn
sobolevn committed Mar 12, 2024
commit 6dae168eaadec88a7360187f2797a8872831f482
1 change: 1 addition & 0 deletions Lib/dataclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,6 +1234,7 @@ def _add_slots(cls, is_frozen, weakref_slot):
# as `method.__closure__`. Since we replace the class with a
# clone, we rewrite these references so it keeps working.
for item in cls.__dict__.values():
Comment thread
sobolevn marked this conversation as resolved.
item = inspect.unwrap(item)
if isinstance(item, (classmethod, staticmethod)):
closure_cells = getattr(item.__func__, "__closure__", None)
Comment on lines +1238 to +1239
Copy link
Copy Markdown
Member

@serhiy-storchaka serhiy-storchaka Mar 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

classmethod and staticmethod have the __wrapped__ attribute since 3.10, so this code is perhaps dead.

elif isinstance(item, property):
Expand Down
22 changes: 22 additions & 0 deletions Lib/test/test_dataclasses/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3628,6 +3628,28 @@ def cached_cl3(cls):
self.assertEqual(inst.cached_cl2(), 53)
self.assertEqual(inst.cached_cl3(), 64)

def test_super_without_params_single_wrapper(self):
def decorator(func):
@wraps(func)
def inner(*args, **kwargs):
return func(*args, **kwargs)
return inner

for slots in (True, False):
with self.subTest(slots=slots):
@dataclass(slots=True)
class A:
def method(self):
return 1

@dataclass(slots=True)
class B(A):
@decorator
def method(self):
return super().method()

self.assertEqual(B().method(), 1)


class TestDescriptors(unittest.TestCase):
def test_set_name(self):
Expand Down