diff options
| author | thunderstruck47 <velislav.gerov.12@aberdeen.ac.uk> | 2017-07-26 15:19:18 +0300 |
|---|---|---|
| committer | thunderstruck47 <velislav.gerov.12@aberdeen.ac.uk> | 2017-07-26 15:19:18 +0300 |
| commit | b878d85dcbf3b57f940e7fe499d7b550f25f75da (patch) | |
| tree | 7481166fd45489d1cee1574030dfdd7b098f45a2 | |
| parent | 4d9adf195be16d8ae99468359e0ac876479482c7 (diff) | |
| download | python-json-patch-b878d85dcbf3b57f940e7fe499d7b550f25f75da.tar.gz | |
fixing array diff bug (issue #30)
| -rw-r--r-- | jsonpatch.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/jsonpatch.py b/jsonpatch.py index 636e807..b1c56d0 100644 --- a/jsonpatch.py +++ b/jsonpatch.py @@ -175,7 +175,11 @@ def make_patch(src, dst): # TODO: fix patch optimiztion and remove the following check # fix when patch with optimization is incorrect patch = JsonPatch.from_diff(src, dst) - new = patch.apply(src) + try: + new = patch.apply(src) + except JsonPatchConflict: # see TODO + return JsonPatch.from_diff(src, dst, False) + if new != dst: return JsonPatch.from_diff(src, dst, False) @@ -601,7 +605,6 @@ def _longest_common_subseq(src, dst): matrix[i][j] = matrix[i-1][j-1] + 1 if matrix[i][j] > z: z = matrix[i][j] - if matrix[i][j] == z: range_src = (i-z+1, i+1) range_dst = (j-z+1, j+1) else: |