Skip to content

gh-98886: Fix issues with dataclass fields with special underscore names #102032

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
hauntsaninja merged 5 commits into from
Mar 25, 2023
Merged

gh-98886: Fix issues with dataclass fields with special underscore names #102032

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b906cb
gh-98886: Fix issues with fields with special underscore names
hauntsaninja Feb 18, 2023
f6ad0f4
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 18, 2023
7217b1a
Merge branch 'main' into gh-98886
hauntsaninja Feb 20, 2023
4322f6f
Merge branch 'main' into gh-98886
hauntsaninja Feb 20, 2023
c1d22c7
use dunder names
hauntsaninja Mar 8, 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
Prev Previous commit
use dunder names
  • Loading branch information
@hauntsaninja
hauntsaninja committed Mar 8, 2023
commit c1d22c72226c07518de5842311f79d687ac5de8e
18 changes: 9 additions & 9 deletions Lib/dataclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,8 @@ def _create_fn(name, args, body, *, globals=None, locals=None,
locals = {}
return_annotation = ''
if return_type is not MISSING:
locals['__dataclass_return_type'] = return_type
return_annotation = '->__dataclass_return_type'
locals['__dataclass_return_type__'] = return_type
return_annotation = '->__dataclass_return_type__'
args = ','.join(args)
body = '\n'.join(f' {b}' for b in body)

Expand Down Expand Up @@ -468,14 +468,14 @@ def _field_init(f, frozen, globals, self_name, slots):
# Return the text of the line in the body of __init__ that will
# initialize this field.

default_name = f'__dataclass_dflt_{f.name}'
default_name = f'__dataclass_dflt_{f.name}__'
if f.default_factory is not MISSING:
if f.init:
# This field has a default factory. If a parameter is
# given, use it. If not, call the factory.
globals[default_name] = f.default_factory
value = (f'{default_name}() '
f'if {f.name} is __dataclass_HAS_DEFAULT_FACTORY '
f'if {f.name} is __dataclass_HAS_DEFAULT_FACTORY__ '
f'else {f.name}')
else:
# This is a field that's not in the __init__ params, but
Expand Down Expand Up @@ -536,11 +536,11 @@ def _init_param(f):
elif f.default is not MISSING:
# There's a default, this will be the name that's used to look
# it up.
default = f'=__dataclass_dflt_{f.name}'
default = f'=__dataclass_dflt_{f.name}__'
elif f.default_factory is not MISSING:
# There's a factory function. Set a marker.
default = '=__dataclass_HAS_DEFAULT_FACTORY'
return f'{f.name}:__dataclass_type_{f.name}{default}'
default = '=__dataclass_HAS_DEFAULT_FACTORY__'
return f'{f.name}:__dataclass_type_{f.name}__{default}'


def _init_fn(fields, std_fields, kw_only_fields, frozen, has_post_init,
Expand All @@ -563,9 +563,9 @@ def _init_fn(fields, std_fields, kw_only_fields, frozen, has_post_init,
raise TypeError(f'non-default argument {f.name!r} '
'follows default argument')

locals = {f'__dataclass_type_{f.name}': f.type for f in fields}
locals = {f'__dataclass_type_{f.name}__': f.type for f in fields}
locals.update({
'__dataclass_HAS_DEFAULT_FACTORY': _HAS_DEFAULT_FACTORY,
'__dataclass_HAS_DEFAULT_FACTORY__': _HAS_DEFAULT_FACTORY,
'__dataclass_builtins_object__': object,
})

Expand Down