Skip to content

use json instead of simplejson #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nikolas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use json instead of simplejson #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions django_decorators/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

Expand Down