Merge pull request #225 from dekkers/remove-double-isinstance-check

Remove double isinstance check in force_unicode
2012-07-29 17:07:55 -07:00 · 2012-07-29 17:07:55 -07:00 · e567f439bd
parent c0748a621c 226a3e7e00
commit e567f439bd
1 changed files with 1 additions and 1 deletions
--- 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.