From 8f08a06edf732e3046ae92c01900321f2d4bff0d Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Thu, 13 Aug 2015 15:40:16 -0400 Subject: [PATCH] use json instead of simplejson --- django_decorators/decorators.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/django_decorators/decorators.py b/django_decorators/decorators.py index ab84d48..ab61a41 100644 --- a/django_decorators/decorators.py +++ b/django_decorators/decorators.py @@ -1,10 +1,7 @@ # -*- coding: utf-8 -*- +import json from django.http import HttpResponse, HttpResponseBadRequest,\ HttpResponseNotAllowed -try: - from django.utils import simplejson -except: - import json as simplejson from django.core.serializers.json import DjangoJSONEncoder from django.core import serializers from django.db.models.query import QuerySet @@ -46,13 +43,13 @@ def decorator(request, *args, **kwargs): if isinstance(objects, QuerySet): data = serializers.serialize("json", objects) else: - data = simplejson.dumps(objects, cls=DjangoJSONEncoder) + data = json.dumps(objects, cls=DjangoJSONEncoder) if 'callback' in request.REQUEST: # a jsonp response! data = '%s(%s);' % (request.REQUEST['callback'], data) return HttpResponse(data, "application/javascript") except: - data = simplejson.dumps(str(objects), cls=DjangoJSONEncoder) + data = json.dumps(str(objects), cls=DjangoJSONEncoder) return HttpResponse(data, "application/json") return decorator