jsonpatch 1.35__py3-none-any.whl → 1.36__py3-none-any.whl

{jsonpatch-1.35.dist-info → jsonpatch-1.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jsonpatch
-Version: 1.35
+Version: 1.36
 Summary:  Apply JSON-Patches (RFC 6902) 
 Home-page: https://github.com/stefankoegl/python-json-patch
 Author: Stefan Kögl

jsonpatch-1.36.dist-info/RECORD

@@ -0,0 +1,9 @@
+jsonpatch.py,sha256=zlmSJbQUudEtW-I7qw-sit7E5KyEMm_MMYFDEx2JyDo,43250
+jsonpatch_cli.py,sha256=-jUMm0QA5Z13bf2C3uLfZe7YH-vxqbGeDltZ9zd4K4I,5240
+jsonpatch-1.36.dist-info/licenses/AUTHORS,sha256=hOtEnBGbfDegKjzMDEl5vuVJyczbI2PlYE2ho4LjGNQ,140
+jsonpatch-1.36.dist-info/licenses/LICENSE,sha256=Q5PrZzP6HjZ_QXabOC9PG-e_Da6x4kPtkrP12Lr9I28,1481
+jsonpatch-1.36.dist-info/METADATA,sha256=EAKYkquXqZWRxQB-ejAILD8eEk2l5U-1bk8AcilDNoM,3672
+jsonpatch-1.36.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+jsonpatch-1.36.dist-info/entry_points.txt,sha256=aY9ormBVRZHHDaAeMcdqTBwZ-ax7GvBTSQ33I75xtZM,98
+jsonpatch-1.36.dist-info/top_level.txt,sha256=efUF341HUk8WcQKnFt8ZLKEKNrm1kFT76Flr38Fjno0,24
+jsonpatch-1.36.dist-info/RECORD,,

jsonpatch.py

@@ -54,7 +54,7 @@ _EXACT_MATCH_LIMIT = 500 ** 2
 
 # Will be parsed by setup.py to determine package metadata
 __author__ = 'Stefan Kögl <stefan@skoegl.net>'
-__version__ = '1.35'
+__version__ = '1.36'
 __website__ = 'https://github.com/stefankoegl/python-json-patch'
 __license__ = 'BSD-3-Clause'
 
@@ -597,6 +597,10 @@ class JsonPatch(object):
         :param dst: Data target document object.
         :type dst: dict
 
+        :param optimization: Generate move operations for matching values.
+                             Set to False to use only add, remove and replace.
+        :type optimization: bool
+
         :param dumps: A function of one argument that produces a serialized
                       JSON string.
         :type dumps: Callable
@@ -614,7 +618,8 @@ class JsonPatch(object):
         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,
+                              optimization=optimization)
         builder._compare_values((), None, src, dst)
         ops = list(builder.execute())
         return cls(ops, pointer_cls=pointer_cls)
@@ -670,9 +675,11 @@ class JsonPatch(object):
 
 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,
+                 optimization=True):
         self.dumps = dumps
         self.pointer_cls = pointer_cls
+        self.optimization = optimization
         self.index_storage = [{}, {}]
         self.__root = root = []
         self.src_doc = src_doc
@@ -693,10 +700,14 @@ class DiffBuilder(object):
             return id(value)
 
     def store_index(self, value, index, st):
+        if not self.optimization:
+            return
         storage = self.index_storage[st]
         storage.setdefault(self._move_key(value), []).append(index)
 
     def take_index(self, value, st):
+        if not self.optimization:
+            return None
         stored = self.index_storage[st].get(self._move_key(value))
         if stored:
             return stored.pop()

jsonpatch_cli.py

@@ -126,12 +126,11 @@ def patch_files():
                 if args.backup:
                     os.link(args.ORIGINAL.name, args.ORIGINAL.name + '.orig')
                 os.chmod(pathname, os.stat(args.ORIGINAL.name).st_mode)
-                os.rename(pathname, args.ORIGINAL.name)
+                os.replace(pathname, args.ORIGINAL.name)
 
             except OSError:
-                # In the event we could not actually do the atomic
-                # replace, unlink the original to move it out of the
-                # way and finally move the temporary file into place.
-                
-                os.unlink(args.ORIGINAL.name)
-                os.rename(pathname, args.ORIGINAL.name)
+                # Preserve the original if backup, permissions, or replacement
+                # fails. replace() can overwrite an existing file on Windows
+                # without unlinking it first.
+                os.unlink(pathname)
+                raise

jsonpatch-1.35.dist-info/RECORD

@@ -1,9 +0,0 @@
-jsonpatch.py,sha256=fO9Isq-oqu2Ua64PLMzuV3wCVIrx0SW7v9xB84W44rA,42817
-jsonpatch_cli.py,sha256=HD5iqPJP__uTPKm50eg7xbTaTuQHL4Bt7MpgO-vlzaM,5304
-jsonpatch-1.35.dist-info/licenses/AUTHORS,sha256=hOtEnBGbfDegKjzMDEl5vuVJyczbI2PlYE2ho4LjGNQ,140
-jsonpatch-1.35.dist-info/licenses/LICENSE,sha256=Q5PrZzP6HjZ_QXabOC9PG-e_Da6x4kPtkrP12Lr9I28,1481
-jsonpatch-1.35.dist-info/METADATA,sha256=v3G9IpDxUG83tcXWWPX4CQlfs4lMll0QGIw2i9qfDMM,3672
-jsonpatch-1.35.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-jsonpatch-1.35.dist-info/entry_points.txt,sha256=aY9ormBVRZHHDaAeMcdqTBwZ-ax7GvBTSQ33I75xtZM,98
-jsonpatch-1.35.dist-info/top_level.txt,sha256=efUF341HUk8WcQKnFt8ZLKEKNrm1kFT76Flr38Fjno0,24
-jsonpatch-1.35.dist-info/RECORD,,