aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/parsers.py
diff options
context:
space:
mode:
authorXavier Ordoquy2013-01-03 11:41:07 +0100
committerXavier Ordoquy2013-01-03 11:41:07 +0100
commit60250f22c8e144494f372338c16a2167cccb319d (patch)
treea467ab51837175ab29abec7eb22bb936375763da /rest_framework/parsers.py
parentcf51dcc9bb409fb985d5aa09c426d1ed33f6e9b4 (diff)
downloaddjango-rest-framework-60250f22c8e144494f372338c16a2167cccb319d.tar.bz2
Move the various compat things to the compat module.
Diffstat (limited to 'rest_framework/parsers.py')
-rw-r--r--rest_framework/parsers.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index d5cfaaf8..7c01006a 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -5,14 +5,13 @@ They give us a generic way of being able to handle various media types
on the request, such as form content or json encoded data.
"""
-import six
-
from django.http import QueryDict
from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
from django.http.multipartparser import MultiPartParserError
from django.utils import simplejson as json
from rest_framework.compat import yaml, ETParseError
from rest_framework.exceptions import ParseError
+from rest_framework.compat import six
from xml.etree import ElementTree as ET
from xml.parsers.expat import ExpatError
import datetime