aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/compat.py
diff options
context:
space:
mode:
Diffstat (limited to 'rest_framework/compat.py')
-rw-r--r--rest_framework/compat.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index ef11b85b..8c64d951 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -7,11 +7,11 @@ from __future__ import unicode_literals
import django
-# Try to import six from Django, fallback to six itself (1.3.x)
+# Try to import six from Django, fallback to included `six`.
try:
from django.utils import six
except:
- import six
+ from rest_framework import six
# location of patterns, url, include changes in 1.4 onwards
try: