summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-09-04 09:24:39 +0200
committerClaude Paroz <claude@2xlibre.net>2012-09-04 09:27:28 +0200
commitcc9b767fc60a8b0455a67f00ca23077b55e709bb (patch)
tree6d01b0f806720932df168f4b66a3b3e2884a93db /django/utils/encoding.py
parent03ad7d3c2085fa252e7bf6a725fec1ed3d1e6a7c (diff)
Fixed #18902 -- Made force_bytes properly handle exception input
Thanks Aymeric Augustin for the report and the initial patch.
Diffstat (limited to 'django/utils/encoding.py')
-rw-r--r--django/utils/encoding.py2
1 files changed, 1 insertions, 1 deletions
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: