aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/settings.py
diff options
context:
space:
mode:
authorXavier Ordoquy2012-11-22 00:20:49 +0100
committerXavier Ordoquy2012-11-22 00:20:49 +0100
commitb3698acb6c0b9eaa04189599e27014c788a75adc (patch)
tree25de3a90ca99b6de980ce0c4031ffb512d9f9c00 /rest_framework/settings.py
parentab3c47297481b7a4ff66027618f9c05bf02a2204 (diff)
downloaddjango-rest-framework-b3698acb6c0b9eaa04189599e27014c788a75adc.tar.bz2
First passing test under p3k \o/
Diffstat (limited to 'rest_framework/settings.py')
-rw-r--r--rest_framework/settings.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index ee24a4ad..9e73bbfb 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -19,6 +19,8 @@ back to the defaults.
"""
from django.conf import settings
from django.utils import importlib
+from six import string_types
+
USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None)
@@ -98,7 +100,7 @@ def perform_import(val, setting_name):
If the given setting is a string import notation,
then perform the necessary import or imports.
"""
- if isinstance(val, basestring):
+ if isinstance(val, string_types):
return import_from_string(val, setting_name)
elif isinstance(val, (list, tuple)):
return [import_from_string(item, setting_name) for item in val]