summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jsonpatch.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/jsonpatch.py b/jsonpatch.py
index d1d091f..8db0b7f 100644
--- a/jsonpatch.py
+++ b/jsonpatch.py
@@ -188,18 +188,7 @@ def make_patch(src, dst):
True
"""
- # TODO: fix patch optimiztion and remove the following check
- # fix when patch with optimization is incorrect
- patch = JsonPatch.from_diff(src, dst)
- 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)
-
- return patch
+ return JsonPatch.from_diff(src, dst)
class JsonPatch(object):