encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-06 13:30:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

python 3 compat

Browse Source
This commit is contained in:
Craig Blaszczyk 2014-12-31 18:11:09 +00:00
parent 0b6107c31e
commit 7308e34c2e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/settings.py
View File

@ -196,14 +196,14 @@ class APISettings(object):
default = self.defaults[attr] default = self.defaults[attr]
if issubclass(val.__class__, Iterable) \ if issubclass(val.__class__, Iterable) \
and (not issubclass(default.__class__, Iterable) and (not issubclass(default.__class__, Iterable)
or isinstance(val, basestring)): or isinstance(val, six.string_types)):
warnings.warn( warnings.warn(
"The `{attr}` setting must be iterable".format(**locals()), "The `{attr}` setting must be iterable".format(**locals()),
RESTFrameworkSettingHasUnexpectedClassWarning, RESTFrameworkSettingHasUnexpectedClassWarning,
stacklevel=3 stacklevel=3
) )
elif isinstance(default, basestring) and not \ elif isinstance(default, six.string_types) and not \
isinstance(val, basestring): isinstance(val, six.string_types):
warnings.warn( warnings.warn(
"The `{attr}` setting must be a string".format(**locals()), "The `{attr}` setting must be a string".format(**locals()),
RESTFrameworkSettingHasUnexpectedClassWarning, RESTFrameworkSettingHasUnexpectedClassWarning,