remove Python 2.5 compatability
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
language: python
|
||||
python:
|
||||
- "2.5"
|
||||
- "2.6"
|
||||
- "2.7"
|
||||
- "3.2"
|
||||
|
||||
23
jsonpatch.py
23
jsonpatch.py
@@ -43,10 +43,7 @@ __license__ = 'Modified BSD License'
|
||||
import copy
|
||||
import sys
|
||||
|
||||
if sys.version_info < (2, 6):
|
||||
import simplejson as json
|
||||
else:
|
||||
import json
|
||||
import json
|
||||
|
||||
import jsonpointer
|
||||
|
||||
@@ -352,13 +349,8 @@ class RemoveOperation(PatchOperation):
|
||||
subobj, part = self.pointer.to_last(obj)
|
||||
try:
|
||||
del subobj[part]
|
||||
except KeyError:
|
||||
exc_info = sys.exc_info()
|
||||
exc = JsonPatchConflict(str(exc_info[1]))
|
||||
if sys.version_info >= (3, 0):
|
||||
raise exc.with_traceback(exc_info[2])
|
||||
else:
|
||||
raise exc
|
||||
except KeyError as ex:
|
||||
raise JsonPatchConflict(str(ex))
|
||||
|
||||
|
||||
class AddOperation(PatchOperation):
|
||||
@@ -439,13 +431,8 @@ class TestOperation(PatchOperation):
|
||||
else:
|
||||
val = self.pointer.walk(subobj, part)
|
||||
|
||||
except JsonPointerException:
|
||||
exc_info = sys.exc_info()
|
||||
exc = JsonPatchTestFailed(str(exc_info[1]))
|
||||
if sys.version_info >= (3, 0):
|
||||
raise exc.with_traceback(exc_info[2])
|
||||
else:
|
||||
raise exc
|
||||
except JsonPointerException as ex:
|
||||
raise JsonPatchTestFailed(str(ex))
|
||||
|
||||
if 'value' in self.operation:
|
||||
value = self.operation['value']
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
simplejson #required for Python 2.5 compatability
|
||||
jsonpointer>=0.5
|
||||
|
||||
Reference in New Issue
Block a user