summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-07-20 14:22:00 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-07-22 09:29:54 +0200
commit3cb2457f46b3e40ff6b6acffcb3fd44cbea091e5 (patch)
tree68e43a061f1a7a122c02d5c5b39586b32959a9dc /django/utils/encoding.py
parentcacd845996d1245f6aed257bff5f748f46206d3f (diff)
[py3] Replaced basestring by six.string_types.
Diffstat (limited to 'django/utils/encoding.py')
-rw-r--r--django/utils/encoding.py4
1 files changed, 2 insertions, 2 deletions
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: