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/settings.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/settings.py')
| -rw-r--r-- | rest_framework/settings.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 6806a468..644751f8 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -18,12 +18,9 @@ REST framework settings, checking for user settings first, then falling back to the defaults. """ from __future__ import unicode_literals - from django.conf import settings -from django.utils import importlib - +from django.utils import importlib, six from rest_framework import ISO_8601 -from rest_framework.compat import six USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None) |