Merge branch 'master' into dev

Author: seperman

deepdiff/search.py

@@ -138,7 +138,10 @@ def __search_obj(self,
             if is_namedtuple:
                 obj = obj._asdict()
             else:
-                obj = obj.__dict__
+                # Skip magic methods. Slightly hacky, but unless people are defining
+                # new magic methods they want to search, it should work fine.
+                obj = {i: getattr(obj, i) for i in dir(obj)
+                    if not (i.startswith('__') and i.endswith('__'))}
         except AttributeError:
             try:
                 obj = {i: getattr(obj, i) for i in obj.__slots__}

tests/test_search.py

@@ -312,6 +312,17 @@ def __eq__(self, other):
         obj = AlwaysEqual()
         item = AlwaysEqual()
         result = {'matched_values': {'root', 'root.some_attr'}}
+
+    def test_search_inherited_attributes(self):
+        class Parent(object):
+            a = 1
+
+        class Child(Parent):
+            b = 2
+
+        obj = Child()
+        item = 1
+        result = {'matched_values': {'root.a'}}
         self.assertEqual(DeepSearch(obj, item, verbose_level=1), result)