summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
authorJeroen Dekkers <jeroen@dekkers.ch>2012-07-24 00:28:29 +0200
committerJeroen Dekkers <jeroen@dekkers.ch>2012-07-24 00:45:40 +0200
commit226a3e7e00357a5c055faa5138d8338243c4c2c9 (patch)
tree5b94ccc4fe8122ac4baee495194b062455c2c6e0 /django/utils/encoding.py
parentae4125ffce6c0a82e9016f67d60d31bc7595887c (diff)
Remove double isinstance check in force_unicode
Diffstat (limited to 'django/utils/encoding.py')
-rw-r--r--django/utils/encoding.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index f2295444bf..b5f4b76507 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -94,7 +94,7 @@ def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'):
# output should be.
s = ' '.join([force_unicode(arg, encoding, strings_only,
errors) for arg in s])
- elif not isinstance(s, six.text_type):
+ else:
# Note: We use .decode() here, instead of six.text_type(s, encoding,
# errors), so that if s is a SafeString, it ends up being a
# SafeUnicode at the end.