aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorTom Christie2014-08-19 17:06:55 +0100
committerTom Christie2014-08-19 17:06:55 +0100
commit63d02dbea855a060ec4cdb194497188e2f40cb66 (patch)
tree6b928af2fb99cabf486bc15079db3cd831d8bf34 /rest_framework/serializers.py
parent00c0dfc66fd2426a63e6eec498395740b2c3e63b (diff)
downloaddjango-rest-framework-63d02dbea855a060ec4cdb194497188e2f40cb66.tar.bz2
Drop six from compat. 1.4.2 is now the lowest supported version.
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 95288671..be8ad3f2 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -20,9 +20,9 @@ from django.contrib.contenttypes.generic import GenericForeignKey
from django.core.paginator import Page
from django.db import models
from django.forms import widgets
+from django.utils import six
from django.utils.datastructures import SortedDict
from django.core.exceptions import ObjectDoesNotExist
-from rest_framework.compat import six
from rest_framework.settings import api_settings