fixing RecursionError where using non UTF-8 character #227

Author: seperman

CHANGELOG.md

@@ -1,5 +1,6 @@
-DeepDiff Change log
+# DeepDiff Change log
 
+- v5-2-3: Retaining the order of multiple dictionary items added via Delta. Fixed the typo with yml files in deep cli. Fixing Grep RecursionError where using non UTF-8 character.
 - v5-2-2: Fixed Delta serialization when None type is present.
 - v5-2-0: Removed Murmur3 as the preferred hashing method. Using SHA256 by default now. Added commandline for deepdiff. Added group_by. Added math_epsilon. Improved ignoring of NoneType.
 - v5-0-2: Bug Fix NoneType in ignore type groups https://github.com/seperman/deepdiff/issues/207

deepdiff/search.py

@@ -223,7 +223,6 @@ def __search_iterable(self,
                           parent="root",
                           parents_ids=frozenset()):
         """Search iterables except dictionaries, sets and strings."""
-
         for i, thing in enumerate(obj):
             new_parent = "{}[{}]".format(parent, i)
             if self.__skip_this(thing, parent=new_parent):
@@ -271,7 +270,7 @@ def __search_tuple(self, obj, item, parent, parents_ids):
 
     def __search(self, obj, item, parent="root", parents_ids=frozenset()):
         """The main search method"""
-
+        # import pytest; pytest.set_trace()
         if self.__skip_this(item, parent):
             return
 
@@ -299,7 +298,7 @@ def __search(self, obj, item, parent="root", parents_ids=frozenset()):
                 self.warning_num += 1
             self.__search_iterable(obj, item, parent, parents_ids)
 
-        elif isinstance(obj, Iterable):
+        elif isinstance(obj, Iterable) and not isinstance(obj, strings):
             self.__search_iterable(obj, item, parent, parents_ids)
 
         else:

docs/changelog.rst

@@ -5,6 +5,7 @@ Changelog
 
 DeepDiff Changelog
 
+- v5-2-3: Retaining the order of multiple dictionary items added via Delta. Fixed the typo with yml files in deep cli. Fixing Grep RecursionError where using non UTF-8 character.
 - v5-2-2: Fixed Delta serialization when None type is present.
 - v5-2-0: Removed Murmur3 as the preferred hashing method. Using SHA256 by default now. Added commandline for deepdiff. Added group_by. Added math_epsilon. Improved ignoring of NoneType.
 - v5-0-2: Bug Fix NoneType in ignore type groups https://github.com/seperman/deepdiff/issues/207

tests/test_search.py

@@ -29,6 +29,18 @@ def test_number_in_list(self):
         result = {"matched_values": {'root[1]'}}
         assert DeepSearch(obj, item, verbose_level=1) == result
 
+    def test_number_in_list2(self):
+        obj = ["a", "10", 10, 20]
+        item = 10
+        result = {"matched_values": {'root[2]'}}
+        assert DeepSearch(obj, item, verbose_level=1) == result
+
+    def test_number_in_list3(self):
+        obj = ["a", "10", 10, 20]
+        item = "10"
+        result = {"matched_values": {'root[1]'}}
+        assert DeepSearch(obj, item, verbose_level=1) == result
+
     def test_string_in_root(self):
         obj = "long string somewhere"
         result = {"matched_values": {'root'}}
@@ -334,3 +346,22 @@ def test_grep_dict(self):
         }
         ds = obj | grep(item)
         assert ds == {'matched_values': {"root['ingredients'][3]"}}
+
+    def test_grep_dict_in_dict(self):
+        obj = {
+            "x": {
+                "y": [
+                    "aaaaaa\u0142 bbbbb"
+                ]
+            },
+            "z": "z",
+        }
+        item = {"z": "z"}
+        result = obj | grep(item)
+        assert {} == result
+
+    def test_grep_with_non_utf8_chars(self):
+        obj = "aaaaaa\u0142 bbbbb"
+        item = {"z": "z"}
+        result = obj | grep(item)
+        assert {} == result