aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/utils/encoders.py
diff options
context:
space:
mode:
authorTom Christie2014-12-05 13:14:14 +0000
committerTom Christie2014-12-05 13:14:14 +0000
commit65d6cba75f9db0995020f01e9144b6660feb47d6 (patch)
tree1212187336ad9f887a4c69dc805506d49f42b86e /rest_framework/utils/encoders.py
parent9fb1b396db751234a531dabacb6758ac2645776c (diff)
parentd9930181ee157f51e2fcea33a3af5ea397647324 (diff)
downloaddjango-rest-framework-65d6cba75f9db0995020f01e9144b6660feb47d6.tar.bz2
Merge pull request #2200 from maryokhin/master
Clean up compat code
Diffstat (limited to 'rest_framework/utils/encoders.py')
-rw-r--r--rest_framework/utils/encoders.py3
1 files changed, 2 insertions, 1 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