Merge branch 'master' of https://github.com/ZoomerAnalytics/jsondiff

jsondiff/__init__.py

@@ -363,8 +363,8 @@ def __init__(self, syntax='compact', load=False, dump=False, marshal=False, load
         self.options.loader = loader
         self.options.dumper = dumper
         self._symbol_map = {
-            symbol.label: symbol
-            for symbol in (add, discard, insert, delete, update)
+            '$' + symbol.label: symbol
+            for symbol in _all_symbols_
         }
 
     def _list_diff_0(self, C, X, Y, i, j):
@@ -564,10 +564,10 @@ def unmarshal(self, d):
                 for k, v in d.items()
             }
         elif isinstance(d, (list, tuple)):
-            return [
-                self.marshal(x)
+            return type(d)(
+                self.unmarshal(x)
                 for x in d
-            ]
+            )
         else:
             return self._unescape(d)
 
@@ -585,10 +585,10 @@ def marshal(self, d):
                 for k, v in d.items()
             }
         elif isinstance(d, (list, tuple)):
-            return [
+            return type(d)(
                 self.marshal(x)
                 for x in d
-            ]
+            )
         else:
             return self._escape(d)
 

jsondiff/symbols.py

@@ -20,6 +20,19 @@ def __str__(self):
 left = Symbol('left')
 right = Symbol('right')
 
+_all_symbols_ = [
+    missing,
+    identical,
+    delete,
+    insert,
+    update,
+    add,
+    discard,
+    replace,
+    left,
+    right
+]
+
 __all__ = [
     'missing',
     'identical',
@@ -30,5 +43,6 @@ def __str__(self):
     'discard',
     'replace',
     'left',
-    'right'
+    'right',
+    '_all_symbols_'
 ]

tests/__init__.py

@@ -54,6 +54,20 @@ def test_a(self):
             diff(['x', 'a', {'u': 10, 'v': 11}, 'c', 'x'], ['a', {'u': 10, 'v': 20}, 'b', 'c'])
         )
 
+    def test_marshal(self):
+        differ = JsonDiffer()
+
+        d = {
+            delete: 3,
+            '$delete': 4,
+            insert: 4,
+            '$$something': 1
+        }
+
+        dm = differ.marshal(d)
+
+        self.assertEqual(d, differ.unmarshal(dm))
+
     def generate_scenario(self, rng):
         a = generate_random_json(rng, sets=True)
         b = perturbate_json(a, rng, sets=True)
@@ -77,13 +91,18 @@ def test_compact_syntax(self, scenario):
         differ = JsonDiffer(syntax='compact')
         d = differ.diff(a, b)
         self.assertEqual(b, differ.patch(a, d))
+        dm = differ.marshal(d)
+        self.assertEqual(d, differ.unmarshal(dm))
+
 
     @randomize(1000, generate_scenario)
     def test_explicit_syntax(self, scenario):
         a, b = scenario
         differ = JsonDiffer(syntax='explicit')
         d = differ.diff(a, b)
         # self.assertEqual(b, differ.patch(a, d))
+        dm = differ.marshal(d)
+        self.assertEqual(d, differ.unmarshal(dm))
 
     @randomize(1000, generate_scenario)
     def test_symmetric_syntax(self, scenario):
@@ -92,3 +111,5 @@ def test_symmetric_syntax(self, scenario):
         d = differ.diff(a, b)
         self.assertEqual(b, differ.patch(a, d))
         self.assertEqual(a, differ.unpatch(b, d))
+        dm = differ.marshal(d)
+        self.assertEqual(d, differ.unmarshal(dm))