[py3] Replaced basestring by six.string_types.

7 files changed, 18 insertions, 9 deletions

diff --git a/django/utils/archive.py b/django/utils/archive.py
index 70e1f9ba59..6b5d73290f 100644
--- a/django/utils/archive.py
+++ b/django/utils/archive.py
@@ -27,6 +27,8 @@ import sys
 import tarfile
 import zipfile
 
+from django.utils import six
+
 
 class ArchiveException(Exception):
     """
@@ -58,7 +60,7 @@ class Archive(object):
     @staticmethod
     def _archive_cls(file):
         cls = None
-        if isinstance(file, basestring):
+        if isinstance(file, six.string_types):
             filename = file
         else:
             try:
diff --git a/django/utils/checksums.py b/django/utils/checksums.py
index 970f563f38..6bbdccc58c 100644
--- a/django/utils/checksums.py
+++ b/django/utils/checksums.py
@@ -4,6 +4,8 @@ Common checksum routines (used in multiple localflavor/ cases, for example).
 
 __all__ = ['luhn',]
 
+from django.utils import six
+
 LUHN_ODD_LOOKUP = (0, 2, 4, 6, 8, 1, 3, 5, 7, 9) # sum_of_digits(index * 2)
 
 def luhn(candidate):
@@ -12,7 +14,7 @@ def luhn(candidate):
     algorithm (used in validation of, for example, credit cards).
     Both numeric and string candidates are accepted.
     """
-    if not isinstance(candidate, basestring):
+    if not isinstance(candidate, six.string_types):
         candidate = str(candidate)
     try:
         evens = sum([int(c) for c in candidate[-1::-2]])
diff --git a/django/utils/dictconfig.py b/django/utils/dictconfig.py
index ae797afcc5..b4d6d66b3c 100644
--- a/django/utils/dictconfig.py
+++ b/django/utils/dictconfig.py
@@ -23,6 +23,8 @@ import re
 import sys
 import types
 
+from django.utils import six
+
 IDENTIFIER = re.compile('^[a-z_][a-z0-9_]*$', re.I)
 
 def valid_ident(s):
@@ -231,7 +233,7 @@ class BaseConfigurator(object):
                  isinstance(value, tuple):
             value = ConvertingTuple(value)
             value.configurator = self
-        elif isinstance(value, basestring): # str for py3k
+        elif isinstance(value, six.string_types): # str for py3k
             m = self.CONVERT_PATTERN.match(value)
             if m:
                 d = m.groupdict()
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 30665480f6..716d46ceff 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -64,7 +64,7 @@ def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'):
     if strings_only and is_protected_type(s):
         return s
     try:
-        if not isinstance(s, basestring,):
+        if not isinstance(s, six.string_types,):
             if hasattr(s, '__unicode__'):
                 s = unicode(s)
             else:
@@ -109,7 +109,7 @@ def smart_str(s, encoding='utf-8', strings_only=False, errors='strict'):
         return s
     if isinstance(s, Promise):
         return unicode(s).encode(encoding, errors)
-    elif not isinstance(s, basestring):
+    elif not isinstance(s, six.string_types):
         try:
             return str(s)
         except UnicodeEncodeError:
diff --git a/django/utils/formats.py b/django/utils/formats.py
index d3afc72729..eae40970da 100644
--- a/django/utils/formats.py
+++ b/django/utils/formats.py
@@ -178,7 +178,7 @@ def sanitize_separators(value):
     """
     if settings.USE_L10N:
         decimal_separator = get_format('DECIMAL_SEPARATOR')
-        if isinstance(value, basestring):
+        if isinstance(value, six.string_types):
             parts = []
             if decimal_separator in value:
                 value, decimals = value.split(decimal_separator, 1)
diff --git a/django/utils/regex_helper.py b/django/utils/regex_helper.py
index 4b8ecea721..8953a21e95 100644
--- a/django/utils/regex_helper.py
+++ b/django/utils/regex_helper.py
@@ -7,6 +7,8 @@ should be good enough for a large class of URLS, however.
 """
 from __future__ import unicode_literals
 
+from django.utils import six
+
 # Mapping of an escape character to a representative of that class. So, e.g.,
 # "\w" is replaced by "x" in a reverse URL. A value of None means to ignore
 # this sequence. Any missing key is mapped to itself.
@@ -302,7 +304,7 @@ def flatten_result(source):
     result_args = [[]]
     pos = last = 0
     for pos, elt in enumerate(source):
-        if isinstance(elt, basestring):
+        if isinstance(elt, six.string_types):
             continue
         piece = ''.join(source[last:pos])
         if isinstance(elt, Group):
diff --git a/django/utils/timezone.py b/django/utils/timezone.py
index d9d9636023..68c214d26f 100644
--- a/django/utils/timezone.py
+++ b/django/utils/timezone.py
@@ -13,6 +13,7 @@ except ImportError:
     pytz = None
 
 from django.conf import settings
+from django.utils import six
 
 __all__ = [
     'utc', 'get_default_timezone', 'get_current_timezone',
@@ -107,7 +108,7 @@ def get_default_timezone():
     """
     global _localtime
     if _localtime is None:
-        if isinstance(settings.TIME_ZONE, basestring) and pytz is not None:
+        if isinstance(settings.TIME_ZONE, six.string_types) and pytz is not None:
             _localtime = pytz.timezone(settings.TIME_ZONE)
         else:
             _localtime = LocalTimezone()
@@ -160,7 +161,7 @@ def activate(timezone):
     """
     if isinstance(timezone, tzinfo):
         _active.value = timezone
-    elif isinstance(timezone, basestring) and pytz is not None:
+    elif isinstance(timezone, six.string_types) and pytz is not None:
         _active.value = pytz.timezone(timezone)
     else:
         raise ValueError("Invalid timezone: %r" % timezone)