Merge branch 'jsonload-no-override'

Author: stefankoegl

jsonpatch.py

@@ -98,7 +98,7 @@ def multidict(ordered_pairs):
 
 # The "object_pairs_hook" parameter is used to handle duplicate keys when
 # loading a JSON object.
-json.load = functools.partial(json.load, object_pairs_hook=multidict)
+_jsonloads = functools.partial(json.loads, object_pairs_hook=multidict)
 
 
 def apply_patch(doc, patch, in_place=False):
@@ -260,7 +260,7 @@ def from_string(cls, patch_str):
 
         :return: :class:`JsonPatch` instance.
         """
-        patch = json.loads(patch_str)
+        patch = _jsonloads(patch_str)
         return cls(patch)
 
     @classmethod