Merge pull request #75 from stefankoegl/jsonptr

Expect path/from attributes also as JsonPoiner instances (#60)

1 files changed, 12 insertions, 3 deletions

diff --git a/jsonpatch.py b/jsonpatch.py
index 06e4f94..326608e 100644
--- a/jsonpatch.py
+++ b/jsonpatch.py
@@ -333,8 +333,14 @@ class PatchOperation(object):
     """A single operation inside a JSON Patch."""
 
     def __init__(self, operation):
-        self.location = operation['path']
-        self.pointer = JsonPointer(self.location)
+
+        if isinstance(operation['path'], JsonPointer):
+            self.location = operation['path'].path
+            self.pointer = operation['path']
+        else:
+            self.location = operation['path']
+            self.pointer = JsonPointer(self.location)
+
         self.operation = operation
 
     def apply(self, obj):
@@ -491,7 +497,10 @@ class MoveOperation(PatchOperation):
 
     def apply(self, obj):
         try:
-            from_ptr = JsonPointer(self.operation['from'])
+            if isinstance(self.operation['from'], JsonPointer):
+                from_ptr = self.operation['from']
+            else:
+                from_ptr = JsonPointer(self.operation['from'])
         except KeyError as ex:
             raise InvalidJsonPatch(
                 "The operation does not contain a 'from' member")