Skip to content

Commit ae50b1c

Browse files
authored
Merge branch 'dev' into relax-requirement
2 parents 5797841 + a114ed2 commit ae50b1c

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,4 @@ Authors in order of the timeline of their contributions:
6363
- [sf-tcalhoun](https://github.com/sf-tcalhoun) for fixing "Instantiating a Delta with a flat_dict_list unexpectedly mutates the flat_dict_list"
6464
- [dtorres-sf](https://github.com/dtorres-sf) for fixing iterable moved items when iterable_compare_func is used.
6565
- [Florian Finkernagel](https://github.com/TyberiusPrime) for pandas and polars support.
66+
- Mathis Chenuet [artemisart](https://github.com/artemisart) for fixing slots classes comparison.

deepdiff/diff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ def unmangle(attribute):
421421
else:
422422
all_slots.extend(slots)
423423

424-
return {i: getattr(object, unmangle(i)) for i in all_slots}
424+
return {i: getattr(object, key) for i in all_slots if hasattr(object, key := unmangle(i))}
425425

426426
def _diff_enum(self, level, parents_ids=frozenset(), local_tree=None):
427427
t1 = detailed__dict__(level.t1, include_keys=ENUM_INCLUDE_KEYS)

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
orderly-set>=5.2.2,<6
1+
orderly-set>=5.2.3,<6

setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ def get_reqs(filename):
3737
license='MIT',
3838
packages=['deepdiff'],
3939
zip_safe=True,
40-
test_suite="tests",
4140
include_package_data=True,
42-
tests_require=['mock'],
4341
long_description=long_description,
4442
long_description_content_type='text/markdown',
4543
install_requires=reqs,

tests/test_diff_text.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1713,7 +1713,7 @@ def __str__(self):
17131713
t2 = Bad()
17141714

17151715
ddiff = DeepDiff(t1, t2)
1716-
result = {'unprocessed': ['root: Bad Object and Bad Object']}
1716+
result = {}
17171717
assert result == ddiff
17181718

17191719
def test_dict_none_item_removed(self):

0 commit comments

Comments
 (0)