aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/parsers.py
diff options
context:
space:
mode:
Diffstat (limited to 'djangorestframework/parsers.py')
-rw-r--r--djangorestframework/parsers.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/djangorestframework/parsers.py b/djangorestframework/parsers.py
index 1503342c..35003a0f 100644
--- a/djangorestframework/parsers.py
+++ b/djangorestframework/parsers.py
@@ -9,17 +9,14 @@ We need a method to be able to:
and multipart/form-data. (eg also handle multipart/json)
"""
from django.http.multipartparser import MultiPartParser as DjangoMPParser
+from django.utils import simplejson as json
+
from djangorestframework.response import ResponseException
from djangorestframework import status
from djangorestframework.utils import as_tuple
from djangorestframework.mediatypes import MediaType
try:
- import json
-except ImportError:
- import simplejson as json
-
-try:
from urlparse import parse_qs
except ImportError:
from cgi import parse_qs