aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/compat.py
diff options
context:
space:
mode:
authorTom Christie2013-08-21 21:30:25 +0100
committerTom Christie2013-08-21 21:30:25 +0100
commit44ceef841543877a700c3fb4a0f84dfecbad0cbb (patch)
treebd291f4dbb4d0b81cd718938f450f2b99f126bc7 /rest_framework/compat.py
parent815ef50735f50c7aff5255e60f1b484e75178e87 (diff)
downloaddjango-rest-framework-44ceef841543877a700c3fb4a0f84dfecbad0cbb.tar.bz2
Updating 2.4.0 release notes
Diffstat (limited to 'rest_framework/compat.py')
-rw-r--r--rest_framework/compat.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index baee3a9c..178a697f 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -14,7 +14,7 @@ from django.conf import settings
try:
from django.utils import six
except ImportError:
- from rest_framework import six
+ import six
# location of patterns, url, include changes in 1.4 onwards
try: