Merge branch 'p3k' of github.com:linovia/django-rest-framework into p3k

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]