diff --git a/pecan/core.py b/pecan/core.py index 3c23a7e..16f0279 100644 --- a/pecan/core.py +++ b/pecan/core.py @@ -10,9 +10,9 @@ from paste.recursive import ForwardRequestException try: - from json import loads -except ImportError: from simplejson import loads +except ImportError: + from json import loads state = local() diff --git a/pecan/jsonify.py b/pecan/jsonify.py index c47a31a..300666b 100644 --- a/pecan/jsonify.py +++ b/pecan/jsonify.py @@ -1,7 +1,7 @@ try: - from json import JSONEncoder -except ImportError: from simplejson import JSONEncoder +except ImportError: + from json import JSONEncoder from datetime import datetime, date from decimal import Decimal @@ -65,4 +65,4 @@ _instance = GenericFunctionJSON() def encode(obj): if isinstance(obj, basestring): return _instance.encode(obj) - return _instance.encode(obj) \ No newline at end of file + return _instance.encode(obj) diff --git a/tests/test_validation.py b/tests/test_validation.py index 353605b..1d268f1 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -5,9 +5,9 @@ from formencode import validators, Schema try: - from json import dumps -except ImportError: from simplejson import dumps +except ImportError: + from json import dumps class TestValidation(object):