Kaydet (Commit) 671a8359 authored tarafından Malcolm Tredinnick's avatar Malcolm Tredinnick

Fixed a small bug in strings_only handling for force_unicode().


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6267 bcc190cf-cafb-0310-a4f2-bffc1f526a37
üst c5990310
......@@ -30,7 +30,7 @@ def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'):
If strings_only is True, don't convert (some) non-string-like objects.
"""
if strings_only and isinstance(s, (types.NoneType, int)):
if strings_only and isinstance(s, (types.NoneType, int, long)):
return s
if not isinstance(s, basestring,):
if hasattr(s, '__unicode__'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment