From 7308e34c2ef3ed175b62d27636c4f003d830ed1b Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk Date: Wed, 31 Dec 2014 18:11:09 +0000 Subject: [PATCH] python 3 compat --- rest_framework/settings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 20594926b..a5b28fa19 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -196,14 +196,14 @@ class APISettings(object): default = self.defaults[attr] if issubclass(val.__class__, Iterable) \ and (not issubclass(default.__class__, Iterable) - or isinstance(val, basestring)): + or isinstance(val, six.string_types)): warnings.warn( "The `{attr}` setting must be iterable".format(**locals()), RESTFrameworkSettingHasUnexpectedClassWarning, stacklevel=3 ) - elif isinstance(default, basestring) and not \ - isinstance(val, basestring): + elif isinstance(default, six.string_types) and not \ + isinstance(val, six.string_types): warnings.warn( "The `{attr}` setting must be a string".format(**locals()), RESTFrameworkSettingHasUnexpectedClassWarning,