Skip to content

gh-90562: Improve zero argument support for super() in dataclasses when slots=True #124692

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
Bobronium wants to merge 18 commits into
base: main
Choose a base branch
from
Open

gh-90562: Improve zero argument support for super() in dataclasses when slots=True #124692

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3b65acf
Improve zero argument support for `super()` in dataclasses
Bobronium Sep 27, 2024
efb6095
Fix NEWS.d formatting
Bobronium Sep 27, 2024
3654f51
Add explanation for _depth use and tests
Bobronium Sep 27, 2024
19297bc
Fix incorrect variable reference
Bobronium Sep 27, 2024
2606480
Correctly unwrap descriptor function
Bobronium Sep 27, 2024
42f9dc3
Add test with using partial as custom wrapper
Bobronium Sep 27, 2024
53c18d1
Rephrase comment explaining _depth argument
Bobronium Sep 27, 2024
96d5315
Add clarification for function search priority
Bobronium Sep 27, 2024
22eeb8f
Ues consistent grammar throughout comments
Bobronium Sep 27, 2024
e91c28b
Fix breaking out from outer loop when handling property
Bobronium Sep 27, 2024
4941a3f
Use generator expression with any() instead of classic loop
Bobronium Sep 27, 2024
6ef5317
Merge branch 'main' into issue-90562-dataclasses-zero-argument-super-fix
Bobronium Sep 27, 2024
d33070f
Apply suggestions from code review
Bobronium Sep 28, 2024
c26e978
Remove leading underscores from seen and depth args
Bobronium Sep 28, 2024
d0173d8
Prevent user-defined code execution during attribute scanning
Bobronium Sep 28, 2024
c68b4cc
Use inspect.getattr_static instead of _safe_get_attributes
Bobronium Oct 5, 2024
7d679f2
Put back the comment in _update_func_cell_for__class__
Bobronium Oct 5, 2024
5bfea4d
Rely on inspect.getmembers_static()
Bobronium Oct 5, 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
Next Next commit
Remove leading underscores from seen and depth args
  • Loading branch information
@Bobronium
Bobronium committed Sep 28, 2024
commit c26e978cce86e079a6c0fdfb4ab615952536955f
16 changes: 8 additions & 8 deletions Lib/dataclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,19 +1237,19 @@ def _update_func_cell_for__class__(f, oldcls, newcls):
return False


def _find_inner_functions(obj, _seen=None, _depth=0):
if _seen is None:
_seen = set()
if id(obj) in _seen:
def _find_inner_functions(obj, seen=None, depth=0):
if seen is None:
seen = set()
if id(obj) in seen:
return None
_seen.add(id(obj))
seen.add(id(obj))

_depth += 1
depth += 1
# Normally just an inspection of a descriptor object itself should be enough,
# and we should encounter the function as its attribute,
# but in case function was wrapped (e.g. functools.partial was used),
# we want to dive at least one level deeper.
if _depth > 2:
if depth > 2:
return None

for attr in dir(obj):
Expand All @@ -1259,7 +1259,7 @@ def _find_inner_functions(obj, _seen=None, _depth=0):
if isinstance(value, types.FunctionType):
yield inspect.unwrap(value)
return
yield from _find_inner_functions(value, _seen, _depth)
yield from _find_inner_functions(value, seen, depth)


def _create_slots(defined_fields, inherited_slots, field_names, weakref_slot):
Expand Down