Use hash to compare equality in AttributeDicts
#3104
Merged
Conversation
This file contains 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
pacrob
changed the title
hash to compare equality in AttributeDicts
pacrob
commented
Sep 20, 2023
pacrob
force-pushed
the
check-attrdict-equality-with-hashes
branch
3 times, most recently
from
2620a18
to
8af3aae
Compare
fselmo
approved these changes
Sep 21, 2023
|
|
||
| ret = dict() | ||
| for k, v in d.items(): | ||
| if isinstance(v, List): | ||
| if isinstance(v, (list, tuple)): |
There was a problem hiding this comment.
Ah, yep... we have to handle the case where there are lists inside of tuples with a recursive check. Nice catch 👍🏼
fselmo
reviewed
Sep 21, 2023
|
|
||
|
|
||
| def test_tupleization_and_hashing_passing_random(): | ||
| for _ in range(1000): |
pacrob
force-pushed
the
check-attrdict-equality-with-hashes
branch
3 times, most recently
from
755521a
to
2f07ac5
Compare
pacrob
force-pushed
the
check-attrdict-equality-with-hashes
branch
from
2f07ac5
to
aa3a172
Compare
reedsa
approved these changes
Sep 21, 2023
| @@ -117,7 +118,9 @@ def __hash__(self) -> int: | |||
| return hash(tuple(sorted(tupleize_lists_nested(self).items()))) | |||
|
|
|||
| def __eq__(self, other: Any) -> bool: | |||
| if isinstance(other, Mapping): | |||
| if isinstance(other, AttributeDict): | |||
| return hash(self) == hash(other) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What was wrong?
Two
AttributeDictscould have the same hash, but not compare as equal.Also found a bug in
tupleize_lists_nestedwhere it wouldn't find lists if they were inside a tuple.Related to Issue #2572
How was it fixed?
Updated
AttributeDict.__eq__to compare hashes if one is being compared to another. It still uses the previous method of converting to dicts for comparison if theotheris another type ofMapping.In
tupleize_lists_nested, added tuples to things that need to be recursively tupleized, in case they have unhashable objects within them.Todo:
Cute Animal Picture