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

Removed an untested and broken branch in force_bytes() (refs #6353).

Browse Source 
The new test crashed in the removed branch. It's unclear if the branch has
value since c6a2bd9b96 didn't include tests.
This commit is contained in:
Tim Graham
2017-02-03 19:36:53 -05:00
committed by GitHub
parent 4ee877a7b0
commit 26619ad7b0
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
django/utils/encoding.py
View File

@@ -108,19 +108,8 @@ def force_bytes(s, encoding='utf-8', strings_only=False, errors='strict'):
return s
if isinstance(s, memoryview):
return bytes(s)
if isinstance(s, Promise):
if isinstance(s, Promise) or not isinstance(s, str):
return str(s).encode(encoding, errors)
if not isinstance(s, str):
try:
return str(s).encode(encoding)
except UnicodeEncodeError:
if isinstance(s, Exception):
# An Exception subclass containing non-ASCII data that doesn't
# know how to print itself properly. We shouldn't raise a
# further exception.
return b' '.join(force_bytes(arg, encoding, strings_only, errors)
for arg in s)
return str(s).encode(encoding, errors)
else:
return s.encode(encoding, errors)