Merge branch 'dev' into relax-requirement

seperman · Sep 29, 2024 · ae50b1c · ae50b1c
2 parents 5797841 + a114ed2
commit ae50b1c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -63,3 +63,4 @@ Authors in order of the timeline of their contributions:
 - [sf-tcalhoun](https://github.com/sf-tcalhoun) for fixing "Instantiating a Delta with a flat_dict_list unexpectedly mutates the flat_dict_list"
 - [dtorres-sf](https://github.com/dtorres-sf) for fixing iterable moved items when iterable_compare_func is used.
 - [Florian Finkernagel](https://github.com/TyberiusPrime) for pandas and polars support.
+- Mathis Chenuet [artemisart](https://github.com/artemisart) for fixing slots classes comparison.
diff --git a/deepdiff/diff.py b/deepdiff/diff.py
@@ -421,7 +421,7 @@ def unmangle(attribute):
                 else:
                     all_slots.extend(slots)
 
-        return {i: getattr(object, unmangle(i)) for i in all_slots}
+        return {i: getattr(object, key) for i in all_slots if hasattr(object, key := unmangle(i))}
 
     def _diff_enum(self, level, parents_ids=frozenset(), local_tree=None):
         t1 = detailed__dict__(level.t1, include_keys=ENUM_INCLUDE_KEYS)

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-orderly-set>=5.2.2,<6
+orderly-set>=5.2.3,<6
diff --git a/setup.py b/setup.py
@@ -37,9 +37,7 @@ def get_reqs(filename):
       license='MIT',
       packages=['deepdiff'],
       zip_safe=True,
-      test_suite="tests",
       include_package_data=True,
-      tests_require=['mock'],
       long_description=long_description,
       long_description_content_type='text/markdown',
       install_requires=reqs,

diff --git a/tests/test_diff_text.py b/tests/test_diff_text.py
@@ -1713,7 +1713,7 @@ def __str__(self):
         t2 = Bad()
 
         ddiff = DeepDiff(t1, t2)
-        result = {'unprocessed': ['root: Bad Object and Bad Object']}
+        result = {}
         assert result == ddiff
 
     def test_dict_none_item_removed(self):