From cc9b767fc60a8b0455a67f00ca23077b55e709bb Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Tue, 4 Sep 2012 09:24:39 +0200 Subject: Fixed #18902 -- Made force_bytes properly handle exception input Thanks Aymeric Augustin for the report and the initial patch. --- django/utils/encoding.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/utils/encoding.py') diff --git a/django/utils/encoding.py b/django/utils/encoding.py index 998cf4f3f7..3b284f3ed0 100644 --- a/django/utils/encoding.py +++ b/django/utils/encoding.py @@ -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: -- cgit v1.3