aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/utils
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/utils
parent09e59f268619927dc22f15fed97c3ceac05ea306 (diff)
downloaddjango-rest-framework-d54c67d79d0f5661ef33d860efe80a4272e22b3e.tar.bz2
Removed custom StringIO, force_text, smart_text compat
Diffstat (limited to 'rest_framework/utils')
-rw-r--r--rest_framework/utils/encoders.py3
-rw-r--r--rest_framework/utils/representation.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
index 4d6bb3a3..adc83e57 100644
--- a/rest_framework/utils/encoders.py
+++ b/rest_framework/utils/encoders.py
@@ -4,8 +4,9 @@ Helper classes for parsers.
from __future__ import unicode_literals
from django.db.models.query import QuerySet
from django.utils import six, timezone
+from django.utils.encoding import force_text
from django.utils.functional import Promise
-from rest_framework.compat import force_text, OrderedDict
+from rest_framework.compat import OrderedDict
import datetime
import decimal
import types
diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py
index 2a7c4675..3f17a8b9 100644
--- a/rest_framework/utils/representation.py
+++ b/rest_framework/utils/representation.py
@@ -3,8 +3,8 @@ Helper functions for creating user-friendly representations
of serializer classes and serializer fields.
"""
from django.db import models
+from django.utils.encoding import force_text
from django.utils.functional import Promise
-from rest_framework.compat import force_text
import re