better support of private variables

Author: seperman

deepdiff/diff.py

@@ -394,8 +394,8 @@ def _diff_obj(self, level, parents_ids=frozenset(),
                 t1 = level.t1._asdict()
                 t2 = level.t2._asdict()
             else:
-                t1 = detailed__dict__(level.t1)
-                t2 = detailed__dict__(level.t2)
+                t1 = detailed__dict__(level.t1, ignore_private_variables=self.ignore_private_variables)
+                t2 = detailed__dict__(level.t2, ignore_private_variables=self.ignore_private_variables)
         except AttributeError:
             try:
                 t1 = self._dict_from_slots(level.t1)

deepdiff/helper.py

@@ -591,10 +591,11 @@ def detailed__dict__(obj, ignore_private_variables=True):
     This is used so we retrieve object properties too.
     """
     result = obj.__dict__.copy()  # A shallow copy
+    private_var_prefix = f"_{obj.__class__.__name__}__"  # The semi private variables in Python get this prefix
     for key in dir(obj):
         if key not in result and (
                 not ignore_private_variables or (
-                    ignore_private_variables and not key.startswith('__')
+                    ignore_private_variables and not key.startswith('__') and not key.startswith(private_var_prefix)
                 )
         ):
             value = getattr(obj, key)

tests/test_diff_text.py

@@ -1617,8 +1617,43 @@ def thing(self):
                 A._thing += 1
                 return A._thing
 
+            @property
+            def __thing2(self):
+                A._thing += 1
+                return A._thing
+
         diff = DeepDiff(A(1), A(1))
-        expected = {'values_changed': {'root._thing': {'new_value': 1, 'old_value': 0},
-                    'root.thing': {'new_value': 2, 'old_value': 1}}}
+        expected = {
+            'values_changed': {
+                'root._thing': {
+                    'new_value': 1,
+                    'old_value': 0
+                },
+                'root.thing': {
+                    'new_value': 2,
+                    'old_value': 1
+                }
+            }
+        }
 
         assert expected == diff
+
+        diff2 = DeepDiff(A(1), A(1), ignore_private_variables=False)
+        expected2 = {
+            'values_changed': {
+                'root._A__thing2': {
+                    'new_value': 5,
+                    'old_value': 3
+                },
+                'root._thing': {
+                    'new_value': 5,
+                    'old_value': 3
+                },
+                'root.thing': {
+                    'new_value': 6,
+                    'old_value': 4
+                }
+            }
+        }
+
+        assert expected2 == diff2

tests/test_ignore_order.py

@@ -823,6 +823,67 @@ def test_ignore_order_and_group_by3(self):
         diff = DeepDiff(t1, t2, group_by='id', ignore_order=True)
         assert {} == diff
 
+    def test_ignore_order_and_group_by4(self):
+        t1 = [
+            {
+                "id": "1",
+                "field_01": {
+                    "subfield_01": {
+                        "subfield_02": {"subfield_03": "1"},
+                    }
+                },
+            },
+            {"id": "2", "field_01": ["1", "2", "3"]},
+            {"id": "3", "field_01": ["1", "2", "3"]},
+        ]
+        t2 = [
+            {
+                "id": "1",
+                "field_01": {
+                    "subfield_01": {
+                        "subfield_02": {"subfield_03": "2"},
+                    }
+                },
+            },
+            {"id": "2", "field_01": ["4", "5", "6"]},
+            {"id": "3", "field_01": ["7", "8", "9"]},
+        ]
+        diff = DeepDiff(t1, t2, group_by='id', ignore_order=True)
+        expected = {
+            'values_changed': {
+                "root['1']['field_01']['subfield_01']['subfield_02']['subfield_03']": {
+                    'new_value': '2',
+                    'old_value': '1'
+                },
+                "root['2']['field_01'][1]": {
+                    'new_value': '5',
+                    'old_value': '2'
+                },
+                "root['3']['field_01'][2]": {
+                    'new_value': '9',
+                    'old_value': '3'
+                },
+                "root['2']['field_01'][0]": {
+                    'new_value': '4',
+                    'old_value': '1'
+                },
+                "root['3']['field_01'][1]": {
+                    'new_value': '8',
+                    'old_value': '2'
+                },
+                "root['3']['field_01'][0]": {
+                    'new_value': '7',
+                    'old_value': '1'
+                },
+                "root['2']['field_01'][2]": {
+                    'new_value': '6',
+                    'old_value': '3'
+                }
+            }
+        }
+
+        assert expected == diff
+
 
 class TestCompareFuncIgnoreOrder: