Commit e567f439 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

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

Remove double isinstance check in force_unicode
parents c0748a62 226a3e7e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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.