summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kögl <stefan@skoegl.net>2017-09-10 19:23:50 +0200
committerStefan Kögl <stefan@skoegl.net>2017-09-10 19:23:50 +0200
commite64987174866ef371f4df048d212eeba4f1a0013 (patch)
tree79b6bbbd64716fbc0f86ea24d8d82e1a372ed788
parent7583258b618a4b651bb2fa41c12ff1c27de15d18 (diff)
downloadpython-json-patch-e64987174866ef371f4df048d212eeba4f1a0013.tar.gz
Remove trailing whitespace
-rw-r--r--jsonpatch.py4
-rwxr-xr-xtests.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/jsonpatch.py b/jsonpatch.py
index b1c56d0..cee4820 100644
--- a/jsonpatch.py
+++ b/jsonpatch.py
@@ -176,10 +176,10 @@ def make_patch(src, dst):
# fix when patch with optimization is incorrect
patch = JsonPatch.from_diff(src, dst)
try:
- new = patch.apply(src)
+ new = patch.apply(src)
except JsonPatchConflict: # see TODO
return JsonPatch.from_diff(src, dst, False)
-
+
if new != dst:
return JsonPatch.from_diff(src, dst, False)
diff --git a/tests.py b/tests.py
index 78b06f5..39f3a85 100755
--- a/tests.py
+++ b/tests.py
@@ -376,7 +376,7 @@ class MakePatchTestCase(unittest.TestCase):
patch = jsonpatch.make_patch(old, new)
new_from_patch = jsonpatch.apply_patch(old, patch)
self.assertEqual(new, new_from_patch)
-
+
def test_arrays_one_element_sequences(self):
""" Tests the case of multiple common one element sequences inside an array """
# see https://github.com/stefankoegl/python-json-patch/issues/30#issuecomment-155070128