p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Remove double isinstance check in force_unicode
This commit is contained in:
Alex Gaynor 2012-07-29 17:07:55 -07:00
parent c0748a621c 226a3e7e00
commit e567f439bd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/utils/encoding.py
View File

@ -94,7 +94,7 @@ def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'):
# output should be. # output should be.
s = ' '.join([force_unicode(arg, encoding, strings_only, s = ' '.join([force_unicode(arg, encoding, strings_only,
errors) for arg in s]) 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, # 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 # errors), so that if s is a SafeString, it ends up being a
# SafeUnicode at the end. # SafeUnicode at the end.