diff options
| author | tom christie tom@tomchristie.com | 2011-04-26 20:20:31 +0100 | 
|---|---|---|
| committer | tom christie tom@tomchristie.com | 2011-04-26 20:20:31 +0100 | 
| commit | 3d15adaeb11a2f2f2961280026232743afc61398 (patch) | |
| tree | b37c359805420721c52f5637edf191508c663288 /djangorestframework/parsers.py | |
| parent | d0fe36aaa48348874d87202442ea8351b63b0e81 (diff) | |
| download | django-rest-framework-3d15adaeb11a2f2f2961280026232743afc61398.tar.bz2 | |
Fixes #35 - Import json from django's built-in package (Does cleverness in determing best lib to use)
Diffstat (limited to 'djangorestframework/parsers.py')
| -rw-r--r-- | djangorestframework/parsers.py | 7 | 
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 | 
