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

Add JsonPatchConflict for patch conflicts

Browse Source 
This is necessary in order to differentiate between
general processing errors e.g. bad operation and
conflicts between the patch and the state of the
data the patch is being applied to.
This commit is contained in:
Byron Ruth
2011-09-16 22:17:09 -04:00
parent 033c5f6ac9
commit 34886739b1
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jsonpatch.py
View File

@@ -47,6 +47,10 @@ class JsonPatchException(Exception):
pass pass
class JsonPatchConflict(JsonPatchException):
pass
def apply_patch(doc, patch): def apply_patch(doc, patch):
""" """
>>> obj = { 'baz': 'qux', 'foo': 'bar' } >>> obj = { 'baz': 'qux', 'foo': 'bar' }
@@ -139,7 +143,7 @@ class PatchOperation(object):
continue continue
if must_exist: if must_exist:
raise JsonPatchException('key %s not found' % loc_part) raise JsonPatchConflict('key %s not found' % loc_part)
else: else:
return obj, part_variants[0] return obj, part_variants[0]
@@ -191,18 +195,18 @@ class AddOperation(PatchOperation):
if isinstance(subobj, list): if isinstance(subobj, list):
if part > len(subobj) or part < 0: if part > len(subobj) or part < 0:
raise JsonPatchException("can't insert outside of list") raise JsonPatchConflict("can't insert outside of list")
subobj.insert(part, value) subobj.insert(part, value)
elif isinstance(subobj, dict): elif isinstance(subobj, dict):
if part in subobj: if part in subobj:
raise JsonPatchException("object '%s' already exists" % part) raise JsonPatchConflict("object '%s' already exists" % part)
subobj[part] = value subobj[part] = value
else: else:
raise JsonPatchException("can't add to type '%s'" % subobj.__class__.__name__) raise JsonPatchConflict("can't add to type '%s'" % subobj.__class__.__name__)
class ReplaceOperation(PatchOperation): class ReplaceOperation(PatchOperation):
@@ -221,13 +225,13 @@ class ReplaceOperation(PatchOperation):
if isinstance(subobj, list): if isinstance(subobj, list):
if part > len(subobj) or part < 0: if part > len(subobj) or part < 0:
raise JsonPatchException("can't replace outside of list") raise JsonPatchConflict("can't replace outside of list")
elif isinstance(subobj, dict): elif isinstance(subobj, dict):
if not part in subobj: if not part in subobj:
raise JsonPatchException("can't replace non-existant object '%s'" % part) raise JsonPatchConflict("can't replace non-existant object '%s'" % part)
else: else:
raise JsonPatchException("can't replace in type '%s'" % subobj.__class__.__name__) raise JsonPatchConflict("can't replace in type '%s'" % subobj.__class__.__name__)
subobj[part] = value subobj[part] = value