Commit 3cb2457f authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[py3] Replaced basestring by six.string_types.

parent cacd8459

django/conf/__init__.py

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ from django.conf import global_settings 
from django.core.exceptions import ImproperlyConfigured

from django.utils.functional import LazyObject, empty

from django.utils import importlib

from django.utils import six



ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -73,7 +74,7 @@ class BaseSettings(object): 
        elif name == "ADMIN_MEDIA_PREFIX":

            warnings.warn("The ADMIN_MEDIA_PREFIX setting has been removed; "

                          "use STATIC_URL instead.", DeprecationWarning)

        elif name == "ALLOWED_INCLUDE_ROOTS" and isinstance(value, basestring):

        elif name == "ALLOWED_INCLUDE_ROOTS" and isinstance(value, six.string_types):

            raise ValueError("The ALLOWED_INCLUDE_ROOTS setting must be set "

                "to a tuple, not a string.")

        object.__setattr__(self, name, value)
@@ -102,7 +103,7 @@ class Settings(BaseSettings): 
            if setting == setting.upper():

                setting_value = getattr(mod, setting)

                if setting in tuple_settings and \

                        isinstance(setting_value, basestring):

                        isinstance(setting_value, six.string_types):

                    warnings.warn("The %s setting must be a tuple. Please fix your "

                                  "settings, as auto-correction is now deprecated." % setting,

                        PendingDeprecationWarning)

django/conf/urls/__init__.py

+3 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ from django.core.urlresolvers import (RegexURLPattern, 
    RegexURLResolver, LocaleRegexURLResolver)

from django.core.exceptions import ImproperlyConfigured

from django.utils.importlib import import_module

from django.utils import six





__all__ = ['handler403', 'handler404', 'handler500', 'include', 'patterns', 'url']
@@ -20,7 +21,7 @@ def include(arg, namespace=None, app_name=None): 
        # No namespace hint - use manually provided namespace

        urlconf_module = arg



    if isinstance(urlconf_module, basestring):

    if isinstance(urlconf_module, six.string_types):

        urlconf_module = import_module(urlconf_module)

    patterns = getattr(urlconf_module, 'urlpatterns', urlconf_module)
@@ -52,7 +53,7 @@ def url(regex, view, kwargs=None, name=None, prefix=''): 
        urlconf_module, app_name, namespace = view

        return RegexURLResolver(regex, urlconf_module, kwargs, app_name=app_name, namespace=namespace)

    else:

        if isinstance(view, basestring):

        if isinstance(view, six.string_types):

            if not view:

                raise ImproperlyConfigured('Empty URL pattern view name not permitted (for pattern %r)' % regex)

            if prefix:

django/contrib/admin/helpers.py

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ from django.template.defaultfilters import capfirst 
from django.utils.encoding import force_unicode, smart_unicode

from django.utils.html import conditional_escape, format_html

from django.utils.safestring import mark_safe

from django.utils import six

from django.utils.translation import ugettext_lazy as _

from django.conf import settings
@@ -49,7 +50,7 @@ class AdminForm(object): 
        try:

            fieldset_name, fieldset_options = self.fieldsets[0]

            field_name = fieldset_options['fields'][0]

            if not isinstance(field_name, basestring):

            if not isinstance(field_name, six.string_types):

                field_name = field_name[0]

            return self.form[field_name]

        except (KeyError, IndexError):

django/contrib/admin/util.py

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ def quote(s): 
    quoting is slightly different so that it doesn't get automatically

    unquoted by the Web browser.

    """

    if not isinstance(s, basestring):

    if not isinstance(s, six.string_types):

        return s

    res = list(s)

    for i in range(len(res)):

django/contrib/formtools/utils.py

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
import pickle



from django.utils.crypto import salted_hmac

from django.utils import six





def form_hmac(form):
@@ -16,7 +17,7 @@ def form_hmac(form): 
            value = bf.data or ''

        else:

            value = bf.field.clean(bf.data) or ''

        if isinstance(value, basestring):

        if isinstance(value, six.string_types):

            value = value.strip()

        data.append((bf.name, value))