Skip to content
Browse files

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

Remove double isinstance check in force_unicode
  • Loading branch information...
2 parents c0748a6 + 226a3e7 commit e567f439bdfc60e16c465220fdaa8ea8a0fae936 @alex alex committed
Showing with 1 addition and 1 deletion.
  1. +1 −1 django/utils/
2 django/utils/
@@ -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.

0 comments on commit e567f43

Please sign in to comment.
Something went wrong with that request. Please try again.