diff options
| author | Tymur Maryokhin | 2014-12-04 03:11:42 +0100 |
|---|---|---|
| committer | Tymur Maryokhin | 2014-12-04 03:11:42 +0100 |
| commit | d54c67d79d0f5661ef33d860efe80a4272e22b3e (patch) | |
| tree | 0ef9ba48601c388545efd3f5d86d143ae9b1eeee /rest_framework/utils/encoders.py | |
| parent | 09e59f268619927dc22f15fed97c3ceac05ea306 (diff) | |
| download | django-rest-framework-d54c67d79d0f5661ef33d860efe80a4272e22b3e.tar.bz2 | |
Removed custom StringIO, force_text, smart_text compat
Diffstat (limited to 'rest_framework/utils/encoders.py')
| -rw-r--r-- | rest_framework/utils/encoders.py | 3 |
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 |
