Skip to content
Closed
Changes from all commits
Commits
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
41 changes: 21 additions & 20 deletions src/attr/_make.py
Original file line number Diff line number Diff line change
Expand Up @@ -2280,18 +2280,27 @@ def _attrs_to_init_script(

init_factory_name = _INIT_FACTORY_PAT % (a.name,)
if converter is not None:
# arg was passed explicitly → validate immediately
lines.append(
" "
+ fmt_setter_with_converter(
attr_name, arg_name, has_on_setattr, converter
)
)
lines.append("else:")
# no arg passed → run factory → validate → assign
lines.append(f" val = {init_factory_name}({maybe_self})")
if a.validator is not None:
val_name = "__attr_validator_" + a.name
attr_name_ref = "__attr_" + a.name
lines.append(f" {val_name}(self, {attr_name_ref}, val)")
names_for_globals[val_name] = a.validator
names_for_globals[attr_name_ref] = a
lines.append(
" "
+ fmt_setter_with_converter(
attr_name,
init_factory_name + "(" + maybe_self + ")",
"val",
has_on_setattr,
converter,
)
Expand All @@ -2300,37 +2309,29 @@ def _attrs_to_init_script(
converter.converter
)
else:
# arg passed explicitly → validate immediately
lines.append(
" " + fmt_setter(attr_name, arg_name, has_on_setattr)
)
lines.append("else:")
# no arg passed → run factory → validate → assign
lines.append(f" val = {init_factory_name}({maybe_self})")
if a.validator is not None:
val_name = "__attr_validator_" + a.name
attr_name_ref = "__attr_" + a.name
lines.append(f" {val_name}(self, {attr_name_ref}, val)")
names_for_globals[val_name] = a.validator
names_for_globals[attr_name_ref] = a
lines.append(
" "
+ fmt_setter(
attr_name,
init_factory_name + "(" + maybe_self + ")",
"val",
has_on_setattr,
)
)
names_for_globals[init_factory_name] = a.default.factory
else:
if a.kw_only:
kw_only_args.append(arg_name)
else:
args.append(arg_name)
pre_init_args.append(arg_name)

if converter is not None:
lines.append(
fmt_setter_with_converter(
attr_name, arg_name, has_on_setattr, converter
)
)
names_for_globals[converter._get_global_name(a.name)] = (
converter.converter
)
else:
lines.append(fmt_setter(attr_name, arg_name, has_on_setattr))
names_for_globals[init_factory_name] = a.default.factory

if a.init is True:
if a.type is not None and converter is None:
Expand Down
Loading