aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/parsers.py
diff options
context:
space:
mode:
authorTymur Maryokhin2014-12-04 03:11:42 +0100
committerTymur Maryokhin2014-12-04 03:11:42 +0100
commitd54c67d79d0f5661ef33d860efe80a4272e22b3e (patch)
tree0ef9ba48601c388545efd3f5d86d143ae9b1eeee /rest_framework/parsers.py
parent09e59f268619927dc22f15fed97c3ceac05ea306 (diff)
downloaddjango-rest-framework-d54c67d79d0f5661ef33d860efe80a4272e22b3e.tar.bz2
Removed custom StringIO, force_text, smart_text compat
Diffstat (limited to 'rest_framework/parsers.py')
-rw-r--r--rest_framework/parsers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index d229abec..7b948362 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -12,7 +12,8 @@ from django.http import QueryDict
from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter
from django.utils import six
-from rest_framework.compat import etree, yaml, force_text, urlparse
+from django.utils.encoding import force_text
+from rest_framework.compat import etree, yaml, urlparse
from rest_framework.exceptions import ParseError
from rest_framework import renderers
import json