Merge pull request #106 from blakehilliard/only-type-diff

Fix issue not recognizing that, in JSON, 1 != 1.0 != True

1 files changed, 11 insertions, 4 deletions

diff --git a/jsonpatch.py b/jsonpatch.py
index a474eae..7f31ce5 100644
--- a/jsonpatch.py
+++ b/jsonpatch.py
@@ -817,10 +817,7 @@ class DiffBuilder(object):
                 self._item_added(path, key, dst[key])
 
     def _compare_values(self, path, key, src, dst):
-        if src == dst:
-            return
-
-        elif isinstance(src, MutableMapping) and \
+        if isinstance(src, MutableMapping) and \
                 isinstance(dst, MutableMapping):
             self._compare_dicts(_path_join(path, key), src, dst)
 
@@ -828,6 +825,16 @@ class DiffBuilder(object):
                 isinstance(dst, MutableSequence):
             self._compare_lists(_path_join(path, key), src, dst)
 
+        # To ensure we catch changes to JSON, we can't rely on a simple
+        # src == dst, or it would not recognize the difference between
+        # 1 and True, among other things. Using json.dumps is the most
+        # fool-proof way to ensure we catch type changes that matter to JSON
+        # and ignore those that don't. The performance of this could be
+        # improved by doing more direct type checks, but we'd need to be
+        # careful to accept type changes that don't matter when JSONified.
+        elif json.dumps(src) == json.dumps(dst):
+            return
+
         else:
             self._item_replaced(path, key, dst)