diff --git a/deepdiff/delta.py b/deepdiff/delta.py index 5c5702b8..070a4f48 100644 --- a/deepdiff/delta.py +++ b/deepdiff/delta.py @@ -211,9 +211,10 @@ def __rsub__(self, other): if self._reversed_diff is None: self._reversed_diff = self._get_reverse_diff() self.diff, self._reversed_diff = self._reversed_diff, self.diff - result = self.__add__(other) - self.diff, self._reversed_diff = self._reversed_diff, self.diff - return result + try: + return self.__add__(other) + finally: + self.diff, self._reversed_diff = self._reversed_diff, self.diff def _raise_or_log(self, msg, level='error'): if self.log_errors: diff --git a/tests/test_delta.py b/tests/test_delta.py index a973706e..68bd39d8 100644 --- a/tests/test_delta.py +++ b/tests/test_delta.py @@ -268,6 +268,24 @@ def test_list_difference_add_delta_when_index_not_valid(self, mock_logger): assert expected_msg == str(excinfo.value) mock_logger.assert_called_once_with(expected_msg) + def test_bidirectional_delta_failed_reverse_keeps_direction(self): + before = {"counter": 1} + after = {"counter": 2} + delta = Delta( + DeepDiff(before, after), + bidirectional=True, + raise_errors=True, + log_errors=False, + ) + assert before + delta == after + + with pytest.raises(DeltaError): + {"counter": 9} - delta + + # The failed reverse application must not leave the delta reversed. + assert before + delta == after + assert after - delta == before + def test_list_difference3_delta(self): t1 = {1: 1, 2: 2, 3: 3, 4: {"a": "hello", "b": [1, 2, 5]}} t2 = {1: 1, 2: 2, 3: 3, 4: {"a": "hello", "b": [1, 3, 2, 5]}}