aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/settings.py
diff options
context:
space:
mode:
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 5c77c55c..b7aa0bbe 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -17,8 +17,10 @@ This module provides the `api_setting` object, that is used to access
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 rest_framework.compat import six
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, six.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]