Merge pull request #76 from maxrothman/search-objs

Search for objects, not just number/str

Author: seperman

deepdiff/search.py

@@ -127,6 +127,11 @@ def __search_obj(self,
                      parents_ids=frozenset({}),
                      is_namedtuple=False):
         """Search objects"""
+        found = False
+        if obj == item:
+            found = True
+            self.__report(report_key='matched_values', key=parent, value=obj)
+        
         try:
             if is_namedtuple:
                 obj = obj._asdict()
@@ -136,7 +141,9 @@ def __search_obj(self,
             try:
                 obj = {i: getattr(obj, i) for i in obj.__slots__}
             except AttributeError:
-                self['unprocessed'].append("%s" % parent)
+                if not found:
+                    self['unprocessed'].append("%s" % parent)
+                
                 return
 
         self.__search_dict(

tests/test_search.py

@@ -15,6 +15,7 @@
 """
 import unittest
 from deepdiff import DeepSearch, grep
+from datetime import datetime
 import logging
 logging.disable(logging.CRITICAL)
 
@@ -286,6 +287,30 @@ def test_case_insensitive_of_str_in_one_liner(self):
         result = {'matched_values': {'root'}}
         self.assertEqual(DeepSearch(obj, item, verbose_level=1, case_sensitive=False), result)
 
+    def test_none(self):
+        obj = item = None
+        result = {'matched_values': {'root'}}
+        self.assertEqual(DeepSearch(obj, item, verbose_level=1), result)
+
+    def test_complex_obj(self):
+        obj  = datetime(2017, 5, 4, 1, 1, 1)
+        item = datetime(2017, 5, 4, 1, 1, 1)
+        result = {'matched_values': {'root'}}
+        self.assertEqual(DeepSearch(obj, item, verbose_level=1), result)
+
+    def test_keep_searching_after_obj_match(self):
+        class AlwaysEqual:
+            def __init__(self, recurse=True):
+                if recurse:
+                    self.some_attr = AlwaysEqual(recurse=False)
+            def __eq__(self, other):
+                return True
+
+        obj = AlwaysEqual()
+        item = AlwaysEqual()
+        result = {'matched_values': {'root', 'root.some_attr'}}
+        self.assertEqual(DeepSearch(obj, item, verbose_level=1), result)
+
 
 class GrepTestCase(unittest.TestCase):