[WIP] Coercing to Unicode

jsonpatch.py

@@ -797,9 +797,18 @@ def _item_added(self, path, key, item):
         index = self.take_index(item, _ST_REMOVE)
         if index is not None:
             op = index[2]
-            if type(op.key) == int and type(key) == int:
-                for v in self.iter_from(index):
-                    op.key = v._on_undo_remove(op.path, op.key)
+            # We can't rely on the op.key type since PatchOperation casts
+            # the .key property to int and this path wrongly ends up being taken
+            # for numeric string dict keys while the intention is to only handle lists.
+            # So we do an explicit check on the data structure type instead.
+            try:
+                src_item = op.pointer.to_last(self.src_doc)[0]
+                if type(src_item) == list:
+                    for v in self.iter_from(index):
+                        op.key = v._on_undo_remove(op.path, op.key)
+            except (KeyError, IndexError):
+                # If the path doesn't exist, assume it's not a list operation
+                pass
 
             self.remove(index)
             if op.location != _path_join(path, key):

tests.py

@@ -526,6 +526,16 @@ def test_issue119(self):
         res = jsonpatch.apply_patch(src, patch)
         self.assertEqual(res, dst)
 
+    def test_numeric_string_dict_keys(self):
+        """Test the reported issue with numeric string dict keys"""
+        src = {'1': 'def'}
+        dst = {'test': '1', 'b': 'def'}
+        # This should not raise an exception
+        patch = jsonpatch.make_patch(src, dst)
+        # Verify the patch works as expected
+        res = jsonpatch.apply_patch(src, patch)
+        self.assertEqual(res, dst)
+
     def test_issue120(self):
         """Make sure it avoids casting numeric str dict key to int"""
         src = [{'foobar': {'821b7213_b9e6_2b73_2e9c_cf1526314553': ['Open Work'],

tests/test_issue_bug.py

@@ -0,0 +1,16 @@
+import unittest
+import jsonpatch
+
+class IssueBugTestCase(unittest.TestCase):
+    def test_numeric_string_dict_keys(self):
+        """Test the issue with numeric string dict keys"""
+        src = {'1': 'def'}
+        dst = {'test': '1', 'b': 'def'}
+        # This should not raise an exception
+        patch = jsonpatch.make_patch(src, dst)
+        # Verify the patch works as expected
+        applied = jsonpatch.apply_patch(src, patch)
+        self.assertEqual(applied, dst)
+
+if __name__ == '__main__':
+    unittest.main()