aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/emitters.py
diff options
context:
space:
mode:
authorTom Christie2011-04-25 04:50:28 +0100
committerTom Christie2011-04-25 04:50:28 +0100
commit762a52edde09297e87c640797219c9bb8255d50a (patch)
treec68aff4f73e988fd2ee2cec827bd3ec528fa6e22 /djangorestframework/emitters.py
parent84a4fd3ea11a55441cb5b8acd584c76fc325edcc (diff)
downloaddjango-rest-framework-762a52edde09297e87c640797219c9bb8255d50a.tar.bz2
Fix some compat issues with json/simplejson
Diffstat (limited to 'djangorestframework/emitters.py')
-rw-r--r--djangorestframework/emitters.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/djangorestframework/emitters.py b/djangorestframework/emitters.py
index 2990d313..39046919 100644
--- a/djangorestframework/emitters.py
+++ b/djangorestframework/emitters.py
@@ -5,6 +5,7 @@ and providing forms and links depending on the allowed methods, emitters and par
"""
from django.conf import settings
from django.template import RequestContext, loader
+from django.utils import simplejson as json
from django import forms
from djangorestframework.response import ErrorResponse
@@ -18,11 +19,6 @@ from urllib import quote_plus
import string
import re
-try:
- import json
-except ImportError:
- import simplejson as json
-
# TODO: Rename verbose to something more appropriate