From d54c67d79d0f5661ef33d860efe80a4272e22b3e Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin
Date: Thu, 4 Dec 2014 03:11:42 +0100
Subject: Removed custom StringIO, force_text, smart_text compat

---
 rest_framework/parsers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rest_framework/parsers.py')

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
-- 
cgit v1.2.3