openstack/deb-python-json-patch
Code Issues Proposed changes

Let apply_patch to handle patch as JSON-encoded string.

Browse Source
This commit is contained in:
Alexander Shorin
2012-06-16 23:35:57 +04:00
parent e90dba067e
commit be9be6d963
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsonpatch.py
View File

@@ -47,6 +47,9 @@ if sys.version_info < (2, 6):
else:
import json
if sys.version_info >= (3, 0):
basestring = (bytes, str)
class JsonPatchException(Exception):
"""Base Json Patch exception"""
@@ -67,7 +70,7 @@ def apply_patch(doc, patch, in_place=False):
:param doc: Document object.
:type doc: dict
:param patch: JSON patch as list of dicts.
:param patch: JSON patch as list of dicts or raw JSON-encoded string.
:type patch: list
:param in_place: While :const:`True` patch will modify target document.
@@ -89,7 +92,10 @@ def apply_patch(doc, patch, in_place=False):
True
"""
patch = JsonPatch(patch)
if isinstance(patch, basestring):
patch = JsonPatch.from_string(patch)
else:
patch = JsonPatch(patch)
return patch.apply(doc, in_place)
def make_patch(src, dst):