mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-25 06:36:07 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #18902 -- Made force_bytes properly handle exception input

Browse Source 
Thanks Aymeric Augustin for the report and the initial patch.
This commit is contained in:
Claude Paroz
2012-09-04 09:24:39 +02:00
parent 03ad7d3c20
commit cc9b767fc6
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/utils/encoding.py
View File

@@ -174,7 +174,7 @@ def force_bytes(s, encoding='utf-8', strings_only=False, errors='strict'):
# An Exception subclass containing non-ASCII data that doesn't
# know how to print itself properly. We shouldn't raise a
# further exception.
return ' '.join([force_bytes(arg, encoding, strings_only,
return b' '.join([force_bytes(arg, encoding, strings_only,
errors) for arg in s])
return six.text_type(s).encode(encoding, errors)
else: