Skip to content

Move _path_join to changable argument #189

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.

Sign up for GitHub

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

Open
we1come32 wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −22
Open

Move _path_join to changable argument #189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 25 additions & 22 deletions jsonpatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,13 @@ def multidict(ordered_pairs):
_jsonloads = functools.partial(json.loads, object_pairs_hook=multidict)


def _path_join(path, key):
if key is None:
return path

return path + '/' + str(key).replace('~', '~0').replace('/', '~1')


def apply_patch(doc, patch, in_place=False, pointer_cls=JsonPointer):
"""Apply list of patches to specified json document.

Expand Down Expand Up @@ -157,7 +164,7 @@ def apply_patch(doc, patch, in_place=False, pointer_cls=JsonPointer):
return patch.apply(doc, in_place)


def make_patch(src, dst, pointer_cls=JsonPointer):
def make_patch(src, dst, pointer_cls=JsonPointer, path_join=_path_join):
"""Generates patch by comparing two document objects. Actually is
a proxy to :meth:`JsonPatch.from_diff` method.

Expand All @@ -178,7 +185,7 @@ def make_patch(src, dst, pointer_cls=JsonPointer):
True
"""

return JsonPatch.from_diff(src, dst, pointer_cls=pointer_cls)
return JsonPatch.from_diff(src, dst, pointer_cls=pointer_cls, path_join=path_join)


class PatchOperation(object):
Expand Down Expand Up @@ -282,7 +289,9 @@ def apply(self, obj):
subobj, part = self.pointer.to_last(obj)

if isinstance(subobj, MutableSequence):
if part == '-':
if part is None:
obj = value # we're replacing the root
elif part == '-':
subobj.append(value) # pylint: disable=E1103

elif part > len(subobj) or part < 0:
Expand Down Expand Up @@ -629,7 +638,7 @@ def from_string(cls, patch_str, loads=None, pointer_cls=JsonPointer):
@classmethod
def from_diff(
cls, src, dst, optimization=True, dumps=None,
pointer_cls=JsonPointer,
pointer_cls=JsonPointer, path_join=_path_join,
):
"""Creates JsonPatch instance based on comparison of two document
objects. Json patch would be created for `src` argument against `dst`
Expand Down Expand Up @@ -658,7 +667,7 @@ def from_diff(
True
"""
json_dumper = dumps or cls.json_dumper
builder = DiffBuilder(src, dst, json_dumper, pointer_cls=pointer_cls)
builder = DiffBuilder(src, dst, json_dumper, pointer_cls=pointer_cls, path_join=path_join)
builder._compare_values('', None, src, dst)
ops = list(builder.execute())
return cls(ops, pointer_cls=pointer_cls)
Expand Down Expand Up @@ -711,9 +720,10 @@ def _get_operation(self, operation):

class DiffBuilder(object):

def __init__(self, src_doc, dst_doc, dumps=json.dumps, pointer_cls=JsonPointer):
def __init__(self, src_doc, dst_doc, dumps=json.dumps, pointer_cls=JsonPointer, path_join=_path_join):
self.dumps = dumps
self.pointer_cls = pointer_cls
self.path_join = path_join
self.index_storage = [{}, {}]
self.index_storage2 = [[], []]
self.__root = root = []
Expand Down Expand Up @@ -802,17 +812,17 @@ def _item_added(self, path, key, item):
op.key = v._on_undo_remove(op.path, op.key)

self.remove(index)
if op.location != _path_join(path, key):
if op.location != self.path_join(path, key):
new_op = MoveOperation({
'op': 'move',
'from': op.location,
'path': _path_join(path, key),
'path': self.path_join(path, key),
}, pointer_cls=self.pointer_cls)
self.insert(new_op)
else:
new_op = AddOperation({
'op': 'add',
'path': _path_join(path, key),
'path': self.path_join(path, key),
'value': item,
}, pointer_cls=self.pointer_cls)
new_index = self.insert(new_op)
Expand All @@ -821,7 +831,7 @@ def _item_added(self, path, key, item):
def _item_removed(self, path, key, item):
new_op = RemoveOperation({
'op': 'remove',
'path': _path_join(path, key),
'path': self.path_join(path, key),
}, pointer_cls=self.pointer_cls)
index = self.take_index(item, _ST_ADD)
new_index = self.insert(new_op)
Expand Down Expand Up @@ -854,7 +864,7 @@ def _item_removed(self, path, key, item):
def _item_replaced(self, path, key, item):
self.insert(ReplaceOperation({
'op': 'replace',
'path': _path_join(path, key),
'path': self.path_join(path, key),
'value': item,
}, pointer_cls=self.pointer_cls))

Expand Down Expand Up @@ -885,11 +895,11 @@ def _compare_lists(self, path, src, dst):

elif isinstance(old, MutableMapping) and \
isinstance(new, MutableMapping):
self._compare_dicts(_path_join(path, key), old, new)
self._compare_dicts(self.path_join(path, key), old, new)

elif isinstance(old, MutableSequence) and \
isinstance(new, MutableSequence):
self._compare_lists(_path_join(path, key), old, new)
self._compare_lists(self.path_join(path, key), old, new)

else:
self._item_removed(path, key, old)
Expand All @@ -904,11 +914,11 @@ def _compare_lists(self, path, src, dst):
def _compare_values(self, path, key, src, dst):
if isinstance(src, MutableMapping) and \
isinstance(dst, MutableMapping):
self._compare_dicts(_path_join(path, key), src, dst)
self._compare_dicts(self.path_join(path, key), src, dst)

elif isinstance(src, MutableSequence) and \
isinstance(dst, MutableSequence):
self._compare_lists(_path_join(path, key), src, dst)
self._compare_lists(self.path_join(path, key), src, dst)

# To ensure we catch changes to JSON, we can't rely on a simple
# src == dst, because it would not recognize the difference between
Expand All @@ -922,10 +932,3 @@ def _compare_values(self, path, key, src, dst):

else:
self._item_replaced(path, key, dst)


def _path_join(path, key):
if key is None:
return path

return path + '/' + str(key).replace('~', '~0').replace('/', '~1')