From 82ac77987808633c625c738ade5f7abc6e6a0764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20K=C3=B6gl?= Date: Sun, 10 Sep 2017 13:29:06 +0200 Subject: Remove re-creation of no-optimization patch --- jsonpatch.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'jsonpatch.py') 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): -- cgit v1.2.1