remove Python 2.5 compatability

This commit is contained in:
Stefan Kögl
2012-12-14 12:56:50 +01:00
parent 7c7a1f50d4
commit 0e6772b3a3
3 changed files with 5 additions and 20 deletions

View File

@@ -1,6 +1,5 @@
language: python language: python
python: python:
- "2.5"
- "2.6" - "2.6"
- "2.7" - "2.7"
- "3.2" - "3.2"

View File

@@ -43,10 +43,7 @@ __license__ = 'Modified BSD License'
import copy import copy
import sys import sys
if sys.version_info < (2, 6): import json
import simplejson as json
else:
import json
import jsonpointer import jsonpointer
@@ -352,13 +349,8 @@ class RemoveOperation(PatchOperation):
subobj, part = self.pointer.to_last(obj) subobj, part = self.pointer.to_last(obj)
try: try:
del subobj[part] del subobj[part]
except KeyError: except KeyError as ex:
exc_info = sys.exc_info() raise JsonPatchConflict(str(ex))
exc = JsonPatchConflict(str(exc_info[1]))
if sys.version_info >= (3, 0):
raise exc.with_traceback(exc_info[2])
else:
raise exc
class AddOperation(PatchOperation): class AddOperation(PatchOperation):
@@ -439,13 +431,8 @@ class TestOperation(PatchOperation):
else: else:
val = self.pointer.walk(subobj, part) val = self.pointer.walk(subobj, part)
except JsonPointerException: except JsonPointerException as ex:
exc_info = sys.exc_info() raise JsonPatchTestFailed(str(ex))
exc = JsonPatchTestFailed(str(exc_info[1]))
if sys.version_info >= (3, 0):
raise exc.with_traceback(exc_info[2])
else:
raise exc
if 'value' in self.operation: if 'value' in self.operation:
value = self.operation['value'] value = self.operation['value']

View File

@@ -1,2 +1 @@
simplejson #required for Python 2.5 compatability
jsonpointer>=0.5 jsonpointer>=0.5