Merge branch 'dev' of github.com:seperman/deepdiff into dev

Author: seperman

deepdiff/diff.py

@@ -562,7 +562,7 @@ def _get_clean_to_keys_mapping(self, keys, level):
                 clean_key = KEY_TO_VAL_STR.format(type_, clean_key)
             else:
                 clean_key = key
-            if self.ignore_string_case:
+            if self.ignore_string_case and isinstance(clean_key, str):
                 clean_key = clean_key.lower()
             if clean_key in result:
                 logger.warning(('{} and {} in {} become the same key when ignore_numeric_type_changes'

deepdiff/model.py

@@ -41,7 +41,7 @@ def remove_empty_keys(self):
         Remove empty keys from this object. Should always be called after the result is final.
         :return:
         """
-        empty_keys = [k for k, v in self.items() if not v]
+        empty_keys = [k for k, v in self.items() if not isinstance(v, (int)) and not v]
 
         for k in empty_keys:
             del self[k]
@@ -88,7 +88,7 @@ def __getitem__(self, item):
         return self.get(item)
 
     def __len__(self):
-        return sum([len(i) for i in self.values() if isinstance(i, SetOrdered)])
+        return sum([len(i) for i in self.values() if isinstance(i, SetOrdered)]) + len([i for i in self.values() if isinstance(i, int)])
 
 
 class TextResult(ResultDict):

tests/test_diff_text.py

@@ -2200,3 +2200,25 @@ class MyDataClass:
 
         diff = DeepDiff(t1, t2, exclude_regex_paths=["any"])
         assert {'values_changed': {'root[MyDataClass(val=2,val2=4)]': {'new_value': 10, 'old_value': 20}}} == diff
+
+
+    def test_group_by_with_none_key_and_ignore_case(self):
+        """Test that group_by works with None keys when ignore_string_case is True"""
+        dict1 = [{'txt_field': 'FULL_NONE', 'group_id': None}, {'txt_field': 'FULL', 'group_id': 'a'}]
+        dict2 = [{'txt_field': 'PARTIAL_NONE', 'group_id': None}, {'txt_field': 'PARTIAL', 'group_id': 'a'}]
+
+        diff = DeepDiff(
+            dict1,
+            dict2,
+            ignore_order=True,
+            group_by='group_id',
+            ignore_string_case=True
+        )
+
+        expected = {'values_changed': {"root[None]['txt_field']":
+                                           {'new_value': 'partial_none', 'old_value': 'full_none'},
+                                       "root['a']['txt_field']":
+                                           {'new_value': 'partial', 'old_value': 'full'}
+                                        }
+                    }
+        assert expected == diff