Skip to content

gh-96151: Use a private name for passing builtins to dataclass #98143

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
ericvsmith merged 8 commits into from
Oct 31, 2022
Merged

gh-96151: Use a private name for passing builtins to dataclass #98143

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e03d52
gh-96151: Use a private name for passing builtins to dataclass
hauntsaninja Oct 10, 2022
7f9f91e
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 10, 2022
2d5f290
add a test case
hauntsaninja Oct 11, 2022
d7e8782
separate out test
hauntsaninja Oct 11, 2022
96cc82b
use dunder builtins
hauntsaninja Oct 17, 2022
e7456f8
actually, prefix with __dataclass
hauntsaninja Oct 30, 2022
8f6e968
Remove builtins logic from _create_fn
hauntsaninja Oct 31, 2022
9d44429
also update comment
hauntsaninja Oct 31, 2022
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 builtins logic from _create_fn
  • Loading branch information
@hauntsaninja
hauntsaninja committed Oct 31, 2022
commit 8f6e96850f59271a1824ee64bc16ab104bcf24e9
5 changes: 2 additions & 3 deletions Lib/dataclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,6 @@ def _create_fn(name, args, body, *, globals=None, locals=None,
# worries about external callers.
if locals is None:
locals = {}
if '__dataclass_builtins__' not in locals:
locals['__dataclass_builtins__'] = builtins
return_annotation = ''
if return_type is not MISSING:
locals['_return_type'] = return_type
Expand Down Expand Up @@ -462,7 +460,7 @@ def _field_assign(frozen, name, value, self_name):
# self_name is what "self" is called in this function: don't
# hard-code "self", since that might be a field name.
if frozen:
return f'__dataclass_builtins__.object.__setattr__({self_name},{name!r},{value})'
return f'__dataclass_builtins_object__.__setattr__({self_name},{name!r},{value})'
return f'{self_name}.{name}={value}'


Expand Down Expand Up @@ -569,6 +567,7 @@ def _init_fn(fields, std_fields, kw_only_fields, frozen, has_post_init,
locals.update({
'MISSING': MISSING,
'_HAS_DEFAULT_FACTORY': _HAS_DEFAULT_FACTORY,
'__dataclass_builtins_object__': object,
})

body_lines = []
Expand Down