-
-
Notifications
You must be signed in to change notification settings - Fork 390
Expose effective class construction params #1454
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.
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
Draft
hynek
wants to merge
6
commits into
main
Choose a base branch
from
params
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+378
−124
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
cad55c2
Implement _AttrsParams
hynek 1edde23
Set __attrs_base_of_slotted__ for unused base classes
hynek cf414ac
Rename to ClassProps
hynek 75f501c
Start renaming fields so it's clearer these aren't just arguments
hynek 627e5a3
Reorder
hynek 5b4756e
Dont's expose has_custom_setattr
hynek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,7 @@ | |
import sys | ||
import types | ||
import unicodedata | ||
import weakref | ||
|
||
from collections.abc import Callable, Mapping | ||
from functools import cached_property | ||
|
@@ -103,6 +104,44 @@ def __reduce__(self, _none_constructor=type(None), _args=()): # noqa: B008 | |
return _none_constructor, _args | ||
|
||
|
||
class _Hashability(enum.Enum): | ||
""" | ||
The hashability of a class. | ||
""" | ||
|
||
HASHABLE = "hashable" # write a __hash__ | ||
UNHASHABLE = "unhashable" # set __hash__ to None | ||
LEAVE_ALONE = "leave_alone" # don't touch __hash__ | ||
|
||
|
||
class ClassProps(NamedTuple): | ||
""" | ||
Effective class properties as derived from parameters to attr.s() or | ||
define() decorators. | ||
|
||
.. versionadded:: 25.4.0 | ||
""" | ||
|
||
is_exception: bool | ||
is_slotted: bool | ||
has_weakref_slot: bool | ||
is_frozen: bool | ||
is_kw_only: bool | ||
force_kw_only: bool | ||
collect_by_mro: bool | ||
init: bool | ||
repr: bool | ||
eq: bool | ||
order: bool | ||
hash: _Hashability | ||
cache_hash: bool | ||
match_args: bool | ||
str: bool | ||
getstate_setstate: bool | ||
on_setattr: Callable[[str, Any], Any] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should these Callables be optional? |
||
field_transformer: Callable[[Attribute], Attribute] | ||
|
||
|
||
def attrib( | ||
default=NOTHING, | ||
validator=None, | ||
|
@@ -673,40 +712,30 @@ def __init__( | |
self, | ||
cls: type, | ||
these, | ||
slots, | ||
frozen, | ||
weakref_slot, | ||
getstate_setstate, | ||
auto_attribs, | ||
kw_only, | ||
force_kw_only, | ||
cache_hash, | ||
is_exc, | ||
collect_by_mro, | ||
on_setattr, | ||
has_custom_setattr, | ||
field_transformer, | ||
auto_attribs: bool, | ||
props: ClassProps, | ||
has_custom_setattr: bool, | ||
): | ||
attrs, base_attrs, base_map = _transform_attrs( | ||
cls, | ||
these, | ||
auto_attribs, | ||
kw_only, | ||
force_kw_only, | ||
collect_by_mro, | ||
field_transformer, | ||
props.is_kw_only, | ||
props.force_kw_only, | ||
props.collect_by_mro, | ||
props.field_transformer, | ||
) | ||
|
||
self._cls = cls | ||
self._cls_dict = dict(cls.__dict__) if slots else {} | ||
self._cls_dict = dict(cls.__dict__) if props.is_slotted else {} | ||
self._attrs = attrs | ||
self._base_names = {a.name for a in base_attrs} | ||
self._base_attr_map = base_map | ||
self._attr_names = tuple(a.name for a in attrs) | ||
self._slots = slots | ||
self._frozen = frozen | ||
self._weakref_slot = weakref_slot | ||
self._cache_hash = cache_hash | ||
self._slots = props.is_slotted | ||
self._frozen = props.is_frozen | ||
self._weakref_slot = props.has_weakref_slot | ||
self._cache_hash = props.cache_hash | ||
self._has_pre_init = bool(getattr(cls, "__attrs_pre_init__", False)) | ||
self._pre_init_has_args = False | ||
if self._has_pre_init: | ||
|
@@ -717,20 +746,21 @@ def __init__( | |
self._pre_init_has_args = len(pre_init_signature.parameters) > 1 | ||
self._has_post_init = bool(getattr(cls, "__attrs_post_init__", False)) | ||
self._delete_attribs = not bool(these) | ||
self._is_exc = is_exc | ||
self._on_setattr = on_setattr | ||
self._is_exc = props.is_exception | ||
self._on_setattr = props.on_setattr | ||
|
||
self._has_custom_setattr = has_custom_setattr | ||
self._wrote_own_setattr = False | ||
|
||
self._cls_dict["__attrs_attrs__"] = self._attrs | ||
self._cls_dict["__attrs_props__"] = props | ||
|
||
if frozen: | ||
if props.is_frozen: | ||
self._cls_dict["__setattr__"] = _frozen_setattrs | ||
self._cls_dict["__delattr__"] = _frozen_delattrs | ||
|
||
self._wrote_own_setattr = True | ||
elif on_setattr in ( | ||
elif self._on_setattr in ( | ||
_DEFAULT_ON_SETATTR, | ||
setters.validate, | ||
setters.convert, | ||
|
@@ -746,18 +776,18 @@ def __init__( | |
break | ||
if ( | ||
( | ||
on_setattr == _DEFAULT_ON_SETATTR | ||
self._on_setattr == _DEFAULT_ON_SETATTR | ||
and not (has_validator or has_converter) | ||
) | ||
or (on_setattr == setters.validate and not has_validator) | ||
or (on_setattr == setters.convert and not has_converter) | ||
or (self._on_setattr == setters.validate and not has_validator) | ||
or (self._on_setattr == setters.convert and not has_converter) | ||
): | ||
# If class-level on_setattr is set to convert + validate, but | ||
# there's no field to convert or validate, pretend like there's | ||
# no on_setattr. | ||
self._on_setattr = None | ||
|
||
if getstate_setstate: | ||
if props.getstate_setstate: | ||
( | ||
self._cls_dict["__getstate__"], | ||
self._cls_dict["__setstate__"], | ||
|
@@ -808,6 +838,7 @@ def build_class(self): | |
self._eval_snippets() | ||
if self._slots is True: | ||
cls = self._create_slots_class() | ||
self._cls.__attrs_base_of_slotted__ = weakref.ref(cls) | ||
else: | ||
cls = self._patch_original_class() | ||
if PY_3_10_PLUS: | ||
|
@@ -1456,6 +1487,7 @@ def attrs( | |
on_setattr = setters.pipe(*on_setattr) | ||
|
||
def wrap(cls): | ||
nonlocal hash | ||
is_frozen = frozen or _has_frozen_base_class(cls) | ||
is_exc = auto_exc is True and issubclass(cls, BaseException) | ||
has_own_setattr = auto_detect and _has_own_attribute( | ||
|
@@ -1466,85 +1498,98 @@ def wrap(cls): | |
msg = "Can't freeze a class with a custom __setattr__." | ||
raise ValueError(msg) | ||
|
||
builder = _ClassBuilder( | ||
cls, | ||
these, | ||
slots, | ||
is_frozen, | ||
weakref_slot, | ||
_determine_whether_to_implement( | ||
eq = not is_exc and _determine_whether_to_implement( | ||
cls, eq_, auto_detect, ("__eq__", "__ne__") | ||
) | ||
|
||
if is_exc: | ||
hashability = _Hashability.LEAVE_ALONE | ||
elif hash is True: | ||
hashability = _Hashability.HASHABLE | ||
elif hash is False: | ||
hashability = _Hashability.LEAVE_ALONE | ||
elif hash is None: | ||
if auto_detect is True and _has_own_attribute(cls, "__hash__"): | ||
hashability = _Hashability.LEAVE_ALONE | ||
elif eq is True and is_frozen is True: | ||
hashability = _Hashability.HASHABLE | ||
elif eq is False: | ||
hashability = _Hashability.LEAVE_ALONE | ||
else: | ||
hashability = _Hashability.UNHASHABLE | ||
else: | ||
msg = "Invalid value for hash. Must be True, False, or None." | ||
raise TypeError(msg) | ||
|
||
if hashability is not _Hashability.HASHABLE and cache_hash: | ||
msg = "Invalid value for cache_hash. To use hash caching, hashing must be either explicitly or implicitly enabled." | ||
raise TypeError(msg) | ||
|
||
props = ClassProps( | ||
is_exception=is_exc, | ||
is_frozen=is_frozen, | ||
is_slotted=slots, | ||
collect_by_mro=collect_by_mro, | ||
init=_determine_whether_to_implement( | ||
cls, init, auto_detect, ("__init__",) | ||
), | ||
repr=_determine_whether_to_implement( | ||
cls, repr, auto_detect, ("__repr__",) | ||
), | ||
eq=eq, | ||
order=not is_exc | ||
and _determine_whether_to_implement( | ||
cls, | ||
order_, | ||
auto_detect, | ||
("__lt__", "__le__", "__gt__", "__ge__"), | ||
), | ||
hash=hashability, | ||
match_args=match_args, | ||
is_kw_only=kw_only, | ||
force_kw_only=force_kw_only, | ||
has_weakref_slot=weakref_slot, | ||
cache_hash=cache_hash, | ||
str=str, | ||
getstate_setstate=_determine_whether_to_implement( | ||
cls, | ||
getstate_setstate, | ||
auto_detect, | ||
("__getstate__", "__setstate__"), | ||
default=slots, | ||
), | ||
auto_attribs, | ||
kw_only, | ||
force_kw_only, | ||
cache_hash, | ||
is_exc, | ||
collect_by_mro, | ||
on_setattr, | ||
has_own_setattr, | ||
field_transformer, | ||
on_setattr=on_setattr, | ||
field_transformer=field_transformer, | ||
) | ||
|
||
if _determine_whether_to_implement( | ||
cls, repr, auto_detect, ("__repr__",) | ||
): | ||
builder = _ClassBuilder( | ||
cls, | ||
these, | ||
auto_attribs=auto_attribs, | ||
props=props, | ||
has_custom_setattr=has_own_setattr, | ||
) | ||
|
||
if props.repr is True: | ||
builder.add_repr(repr_ns) | ||
|
||
if str is True: | ||
if props.str is True: | ||
builder.add_str() | ||
|
||
eq = _determine_whether_to_implement( | ||
cls, eq_, auto_detect, ("__eq__", "__ne__") | ||
) | ||
if not is_exc and eq is True: | ||
if props.eq is True: | ||
builder.add_eq() | ||
if not is_exc and _determine_whether_to_implement( | ||
cls, order_, auto_detect, ("__lt__", "__le__", "__gt__", "__ge__") | ||
): | ||
if props.order is True: | ||
builder.add_order() | ||
|
||
if not frozen: | ||
builder.add_setattr() | ||
|
||
nonlocal hash | ||
if ( | ||
hash is None | ||
and auto_detect is True | ||
and _has_own_attribute(cls, "__hash__") | ||
): | ||
hash = False | ||
|
||
if hash is not True and hash is not False and hash is not None: | ||
# Can't use `hash in` because 1 == True for example. | ||
msg = "Invalid value for hash. Must be True, False, or None." | ||
raise TypeError(msg) | ||
|
||
if hash is False or (hash is None and eq is False) or is_exc: | ||
# Don't do anything. Should fall back to __object__'s __hash__ | ||
# which is by id. | ||
if cache_hash: | ||
msg = "Invalid value for cache_hash. To use hash caching, hashing must be either explicitly or implicitly enabled." | ||
raise TypeError(msg) | ||
elif hash is True or ( | ||
hash is None and eq is True and is_frozen is True | ||
): | ||
# Build a __hash__ if told so, or if it's safe. | ||
if props.hash is _Hashability.HASHABLE: | ||
builder.add_hash() | ||
else: | ||
# Raise TypeError on attempts to hash. | ||
if cache_hash: | ||
msg = "Invalid value for cache_hash. To use hash caching, hashing must be either explicitly or implicitly enabled." | ||
raise TypeError(msg) | ||
elif props.hash is _Hashability.UNHASHABLE: | ||
builder.make_unhashable() | ||
|
||
if _determine_whether_to_implement( | ||
cls, init, auto_detect, ("__init__",) | ||
): | ||
if props.init: | ||
builder.add_init() | ||
else: | ||
builder.add_attrs_init() | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we combine these flags? We can't have force_kw_only without is_kw_only right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that is correct… so another Enum?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. I use literals for this in cattrs but that might be too modern for your tastes ;)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We might want to give
hash
the same treatment -cache_hash
doesn't make sense ifhash
is false. So the enum might be expanded withHASHABLE_CACHED
?