ignore case and ignore type subclass for deep hash

Author: seperman

deepdiff/deephash.py

@@ -11,7 +11,7 @@
 from deepdiff.helper import (strings, numbers, unprocessed, not_hashed, add_to_frozen_set,
                              convert_item_or_items_into_set_else_none, current_dir,
                              convert_item_or_items_into_compiled_regexes_else_none,
-                             get_id)
+                             get_id, type_is_subclass_of_type_group, type_in_type_group)
 from deepdiff.base import Base
 logger = logging.getLogger(__name__)
 
@@ -104,6 +104,7 @@ def __init__(self,
         # the only time it should be set to False is when
         # testing the individual hash functions for different types of objects.
         self.apply_hash = apply_hash
+        self.type_check_func = type_is_subclass_of_type_group if ignore_type_subclasses else type_in_type_group
 
         self._hash(obj, parent="root", parents_ids=frozenset({get_id(obj)}))
 
@@ -225,7 +226,7 @@ def _prep_dict(self, obj, parent, parents_ids=EMPTY_FROZENSET, print_as_attribut
             type_ = original_type or type(obj)
             type_str = type_.__name__
             for type_group in self.ignore_type_in_groups:
-                if type_ in type_group:
+                if self.type_check_func(type_, type_group):
                     type_str = ','.join(map(lambda x: x.__name__, type_group))
                     break
         else:

deepdiff/helper.py

@@ -202,4 +202,4 @@ def type_in_type_group(item, type_group):
 
 
 def type_is_subclass_of_type_group(item, type_group):
-    return isinstance(item, type_group) or type_in_type_group(item, type_group)
+    return isinstance(item, type_group) or issubclass(item, type_group) or type_in_type_group(item, type_group)

tests/test_hash.py

@@ -335,19 +335,38 @@ class Taco:
         def __init__(self):
             self.spicy = True
 
+    class ClassA:
+        def __init__(self, x, y):
+            self.x = x
+            self.y = y
+
+    class ClassB:
+        def __init__(self, x, y):
+            self.x = x
+            self.y = y
+
+    class ClassC(ClassB):
+        pass
+
+    obj_a = ClassA(1, 2)
+    obj_c = ClassC(1, 2)
+
     burrito = Burrito()
     taco = Taco()
 
-    @pytest.mark.parametrize("t1, t2, ignore_type_in_groups, is_qual", [
-        (taco, burrito, [], False),
-        (taco, burrito, [(Taco, Burrito)], True),
-        ([taco], [burrito], [(Taco, Burrito)], True),
-
+    @pytest.mark.parametrize("t1, t2, ignore_type_in_groups, ignore_type_subclasses, is_qual", [
+        # (taco, burrito, [], False, False),
+        # (taco, burrito, [(Taco, Burrito)], False, True),
+        # ([taco], [burrito], [(Taco, Burrito)], False, True),
+        # ([obj_a], [obj_c], [(ClassA, ClassB)], False, False),
+        ([obj_a], [obj_c], [(ClassA, ClassB)], True, True),
     ])
-    def test_objects_with_same_content(self, t1, t2, ignore_type_in_groups, is_qual):
+    def test_objects_with_same_content(self, t1, t2, ignore_type_in_groups, ignore_type_subclasses, is_qual):
 
-        t1_result = DeepHashPrep(t1, ignore_type_in_groups=ignore_type_in_groups)
-        t2_result = DeepHashPrep(t2, ignore_type_in_groups=ignore_type_in_groups)
+        t1_result = DeepHashPrep(t1, ignore_type_in_groups=ignore_type_in_groups,
+                                 ignore_type_subclasses=ignore_type_subclasses)
+        t2_result = DeepHashPrep(t2, ignore_type_in_groups=ignore_type_in_groups,
+                                 ignore_type_subclasses=ignore_type_subclasses)
         assert is_qual == (t1_result[t1] == t2_result[t2])
 
     def test_repetition_by_default_does_not_effect(self):
@@ -471,6 +490,15 @@ def test_skip_regex_path(self):
         assert 2 in t1_hash
         assert t1_hash[2] == t2_hash[2]
 
+    def test_string_case(self):
+        t1 = "Hello"
+
+        t1_hash = DeepHashPrep(t1)
+        assert t1_hash == {'Hello': 'str:Hello'}
+
+        t1_hash = DeepHashPrep(t1, ignore_string_case=True)
+        assert t1_hash == {'Hello': 'str:hello'}
+
 
 class TestDeepHashSHA1:
     """DeepHash with SHA1 Tests."""