diff options
| author | Tom Christie | 2014-08-19 17:06:55 +0100 |
|---|---|---|
| committer | Tom Christie | 2014-08-19 17:06:55 +0100 |
| commit | 63d02dbea855a060ec4cdb194497188e2f40cb66 (patch) | |
| tree | 6b928af2fb99cabf486bc15079db3cd831d8bf34 /rest_framework/fields.py | |
| parent | 00c0dfc66fd2426a63e6eec498395740b2c3e63b (diff) | |
| download | django-rest-framework-63d02dbea855a060ec4cdb194497188e2f40cb66.tar.bz2 | |
Drop six from compat. 1.4.2 is now the lowest supported version.
Diffstat (limited to 'rest_framework/fields.py')
| -rw-r--r-- | rest_framework/fields.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 85fcbd96..9d707c9b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -18,14 +18,14 @@ from django.conf import settings from django.db.models.fields import BLANK_CHOICE_DASH from django.http import QueryDict from django.forms import widgets -from django.utils import timezone +from django.utils import six, timezone from django.utils.encoding import is_protected_type from django.utils.translation import ugettext_lazy as _ from django.utils.datastructures import SortedDict from django.utils.dateparse import parse_date, parse_datetime, parse_time from rest_framework import ISO_8601 from rest_framework.compat import ( - BytesIO, six, smart_text, + BytesIO, smart_text, force_text, is_non_str_iterable ) from rest_framework.settings import api_settings |
