diff options
| author | Stefan Kögl <stefan@skoegl.net> | 2014-04-10 17:48:18 +0200 |
|---|---|---|
| committer | Stefan Kögl <stefan@skoegl.net> | 2014-04-10 17:48:18 +0200 |
| commit | 036045d79a46df894983dffc0641f535f5cf8d99 (patch) | |
| tree | bf2e51c2c51b01e43e9c477d609b05e3a7b50198 | |
| parent | 48010acda5d19ebe516de1c3b68643c9ea5f8045 (diff) | |
| parent | 32177f13481878e044b6748065efb0adc84c24a6 (diff) | |
| download | python-json-patch-036045d79a46df894983dffc0641f535f5cf8d99.tar.gz | |
Merge branch 'remove-error' of https://github.com/umago/python-json-patch
Conflicts:
jsonpatch.py
| -rw-r--r-- | jsonpatch.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jsonpatch.py b/jsonpatch.py index 28dcd13..58fdfe8 100644 --- a/jsonpatch.py +++ b/jsonpatch.py @@ -387,7 +387,8 @@ class RemoveOperation(PatchOperation): try: del subobj[part] except (KeyError, IndexError) as ex: - raise JsonPatchConflict(str(ex)) + msg = "can't remove non-existent object '{0}'".format(part) + raise JsonPatchConflict(msg) return obj |