Skip to content

Fix unnecessary complexity in patch generation for lists of lists #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion jsonpatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,13 @@ def _compare_dicts(self, path, src, dst):
self._compare_values(path, key, src[key], dst[key])

def _compare_lists(self, path, src, dst):
# Special case: If we're inserting an element at the beginning of a list
# and the original elements are moved to subsequent positions
if len(dst) > len(src) and dst[len(dst)-len(src):] == src:
for i in range(len(dst) - len(src)):
self._item_added(path, i, dst[i])
return

len_src, len_dst = len(src), len(dst)
max_len = max(len_src, len_dst)
min_len = min(len_src, len_dst)
Expand All @@ -889,7 +896,12 @@ def _compare_lists(self, path, src, dst):

elif isinstance(old, MutableSequence) and \
isinstance(new, MutableSequence):
self._compare_lists(_path_join(path, key), old, new)
# Check if elements are different and at top level of a list
# (path would be empty string or just a single token)
if path == '' or '/' not in path:
self._item_replaced(path, key, new)
else:
self._compare_lists(_path_join(path, key), old, new)

else:
self._item_removed(path, key, old)
Expand Down
12 changes: 12 additions & 0 deletions tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,18 @@ def test_move_from_numeric_to_alpha_dict_key(self):
patch = jsonpatch.make_patch(src, dst)
res = jsonpatch.apply_patch(src, patch)
self.assertEqual(res, dst)

def test_list_of_lists_add(self):
"""Test patch when inserting an element into a list of lists."""
a = [[1,'a']]
b = [[2,'b'], [1,'a']]
patch = jsonpatch.make_patch(a, b)
self.assertEqual(len(patch.patch), 1)
self.assertEqual(patch.patch[0]['op'], 'add')
self.assertEqual(patch.patch[0]['path'], '/0')
self.assertEqual(patch.patch[0]['value'], [2, 'b'])
res = jsonpatch.apply_patch(a, patch)
self.assertEqual(res, b)

def test_issue90(self):
"""In JSON 1 is different from True even though in python 1 == True"""
Expand Down