patchdiff 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

patchdiff/__init__.py

@@ -2,4 +2,4 @@ from .apply import apply, iapply
 from .diff import diff
 from .serialize import to_json
 
-__version__ = "0.3.3"
+__version__ = "0.3.4"

patchdiff/diff.py

@@ -71,13 +71,13 @@ def diff_lists(input: List, output: List, ptr: Pointer) -> Tuple[List, List]:
                 "path": ptr.append(idx_token),
                 "value": op["value"],
             }
-            return [ops + [full_op], padding + 1]
+            return [[*ops, full_op], padding + 1]
         elif op["op"] == "remove":
             full_op = {
                 "op": "remove",
                 "path": ptr.append(op["idx"] + padding),
             }
-            return [ops + [full_op], padding - 1]
+            return [[*ops, full_op], padding - 1]
         else:
             replace_ptr = ptr.append(op["idx"] + padding)
             replace_ops, _ = diff(op["original"], op["value"], replace_ptr)
@@ -96,7 +96,7 @@ def diff_dicts(input: Dict, output: Dict, ptr: Pointer) -> Tuple[List, List]:
     output_keys = set(output.keys())
     for key in input_keys - output_keys:
         ops.append({"op": "remove", "path": ptr.append(key)})
-        rops.insert(0, {"op": "add", "path": ptr.append(key), "value": output[key]})
+        rops.insert(0, {"op": "add", "path": ptr.append(key), "value": input[key]})
     for key in output_keys - input_keys:
         ops.append(
             {

patchdiff/pointer.py

@@ -1,9 +1,10 @@
+from __future__ import annotations
+
 import re
 from typing import Any, Hashable, List, Tuple
 
 from .types import Diffable
 
-
 tilde0_re = re.compile("~0")
 tilde1_re = re.compile("~1")
 tilde_re = re.compile("~")
@@ -19,21 +20,21 @@ def escape(token: str) -> str:
 
 
 class Pointer:
-    def __init__(self, tokens: List[Hashable] = None) -> None:
+    def __init__(self, tokens: List[Hashable] | None = None) -> None:
         if tokens is None:
             tokens = []
-        self.tokens = tokens
+        self.tokens = tuple(tokens)
 
     @staticmethod
     def from_str(path: str) -> "Pointer":
-        tokens = [unescape(t) for t in path.split("/")]
+        tokens = [unescape(t) for t in path.split("/")[1:]]
         return Pointer(tokens)
 
     def __str__(self) -> str:
         return "/" + "/".join(escape(str(t)) for t in self.tokens)
 
     def __repr__(self) -> str:
-        return f"Pointer({repr(self.tokens)})"
+        return f"Pointer({list(self.tokens)!r})"
 
     def __hash__(self) -> int:
         return hash(self.tokens)
@@ -62,4 +63,4 @@ class Pointer:
 
     def append(self, token: Hashable) -> "Pointer":
         """append, creating new Pointer"""
-        return Pointer(self.tokens + [token])
+        return Pointer((*self.tokens, token))

patchdiff/types.py

@@ -1,3 +1,3 @@
-from typing import Dict, List, Set, Tuple, Union
+from typing import Dict, List, Set, Union
 
-Diffable = Union[Dict, List, Set, Tuple]
+Diffable = Union[Dict, List, Set]

{patchdiff-0.3.3.dist-info → patchdiff-0.3.5.dist-info}/METADATA

@@ -1,20 +1,14 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: patchdiff
-Version: 0.3.3
+Version: 0.3.5
 Summary: MIT
-Home-page: https://github.com/Korijn/patchdiff
-Author: Korijn van Golen
-Author-email: korijn@gmail.com
-Requires-Python: >=3.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Project-URL: Homepage, https://github.com/fork-tongue/patchdiff
+Author-email: Korijn van Golen <korijn@gmail.com>, Berend Klein Haneveld <berendkleinhaneveld@gmail.com>
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 
 [![PyPI version](https://badge.fury.io/py/patchdiff.svg)](https://badge.fury.io/py/patchdiff)
-[![CI status](https://github.com/Korijn/patchdiff/workflows/CI/badge.svg)](https://github.com/Korijn/patchdiff/actions)
+[![CI status](https://github.com/fork-tongue/patchdiff/workflows/CI/badge.svg)](https://github.com/fork-tongue/patchdiff/actions)
 
 # Patchdiff 🔍
 
@@ -58,4 +52,3 @@ print(to_json(ops, indent=4))
 #     }
 # ]
 ```
-

patchdiff-0.3.5.dist-info/RECORD

@@ -0,0 +1,9 @@
+patchdiff/__init__.py,sha256=uQAwiWM9rTop0zZC6Spn0y_v74cfAzuhCxcEFOrAaXY,110
+patchdiff/apply.py,sha256=25TfOTZTYFIjy70mBus5yCzmbJRawbguDffv_4yHjqE,1366
+patchdiff/diff.py,sha256=AQuIhGDnZda-9IykepEHXcfrDJSEJPXuGe8SdLQoquU,5424
+patchdiff/pointer.py,sha256=ZZqJtGYM2uK6P2saOBn0LWxpIb_qgdTFlcE4EQncnRU,1804
+patchdiff/serialize.py,sha256=N0S9e0P49TBMb7ghM--h13MsF59ybiscjZ_auAErTq8,295
+patchdiff/types.py,sha256=BVKXOl3tnQOOml3VI_epTrLn79agi6sD5vNr2acC-yE,77
+patchdiff-0.3.5.dist-info/METADATA,sha256=pea0_lmfx8Y5g5RMNpQGfSJWfQiDQQHFv_yybEQUMkg,1634
+patchdiff-0.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+patchdiff-0.3.5.dist-info/RECORD,,

{patchdiff-0.3.3.dist-info → patchdiff-0.3.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry 1.0.7
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

patchdiff-0.3.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-patchdiff/__init__.py,sha256=tbInajLj-9P4K6vxtAKIYq5vicOdacXqP-AMmgV2hkQ,110
-patchdiff/apply.py,sha256=25TfOTZTYFIjy70mBus5yCzmbJRawbguDffv_4yHjqE,1366
-patchdiff/diff.py,sha256=fQj-2Do6tCivC2W0Y-viCpjCKF3IENh4eBi-SaXSHHI,5425
-patchdiff/pointer.py,sha256=GLRt7jMNGhT8GOb3VI5ouzihTBlkO8rdFnX4juX8y3Y,1749
-patchdiff/serialize.py,sha256=N0S9e0P49TBMb7ghM--h13MsF59ybiscjZ_auAErTq8,295
-patchdiff/types.py,sha256=h-M4VBfJKWfo_kLrTBsqtnHQfl2_FLtbnknOpflgfRg,91
-patchdiff-0.3.3.dist-info/WHEEL,sha256=y3eDiaFVSNTPbgzfNn0nYn5tEn1cX6WrdetDlQM4xWw,83
-patchdiff-0.3.3.dist-info/METADATA,sha256=AeSzfQVS0fMa00jFHT_Snh7Z1pjKJRicybjlMBByLaY,1808
-patchdiff-0.3.3.dist-info/RECORD,,