aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.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/fields.py
parent09e59f268619927dc22f15fed97c3ceac05ea306 (diff)
downloaddjango-rest-framework-d54c67d79d0f5661ef33d860efe80a4272e22b3e.tar.bz2
Removed custom StringIO, force_text, smart_text compat
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index ca9c479f..37adbe16 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -5,11 +5,11 @@ from django.core.validators import RegexValidator
from django.forms import ImageField as DjangoImageField
from django.utils import six, timezone
from django.utils.dateparse import parse_date, parse_datetime, parse_time
-from django.utils.encoding import is_protected_type
+from django.utils.encoding import is_protected_type, smart_text
from django.utils.translation import ugettext_lazy as _
from rest_framework import ISO_8601
from rest_framework.compat import (
- smart_text, EmailValidator, MinValueValidator, MaxValueValidator,
+ EmailValidator, MinValueValidator, MaxValueValidator,
MinLengthValidator, MaxLengthValidator, URLValidator, OrderedDict
)
from rest_framework.exceptions import ValidationError