aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/request.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/request.py
parent09e59f268619927dc22f15fed97c3ceac05ea306 (diff)
downloaddjango-rest-framework-d54c67d79d0f5661ef33d860efe80a4272e22b3e.tar.bz2
Removed custom StringIO, force_text, smart_text compat
Diffstat (limited to 'rest_framework/request.py')
-rw-r--r--rest_framework/request.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/request.py b/rest_framework/request.py
index d7e74674..20e049ed 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -14,9 +14,9 @@ from django.http import QueryDict
from django.http.multipartparser import parse_header
from django.utils.datastructures import MultiValueDict
from django.utils.datastructures import MergeDict as DjangoMergeDict
+from django.utils.six import BytesIO
from rest_framework import HTTP_HEADER_ENCODING
from rest_framework import exceptions
-from rest_framework.compat import BytesIO
from rest_framework.settings import api_settings
import warnings