summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2012-07-29 17:07:55 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2012-07-29 17:07:55 -0700
commite567f439bdfc60e16c465220fdaa8ea8a0fae936 (patch)
tree7e0c159125c030e4c75d0e14406482401ac7f66a
parentc0748a621ceaae0f90133bb7980c857bf13811a1 (diff)
parent226a3e7e00357a5c055faa5138d8338243c4c2c9 (diff)
Merge pull request #225 from dekkers/remove-double-isinstance-check
Remove double isinstance check in force_unicode
-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.