summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2018-07-09 11:26:22 +0500
committerTim Graham <timograham@gmail.com>2018-07-09 12:25:55 -0400
commit7d6fe18dde78d07e5f0249e21419f19a67ca4aa4 (patch)
tree49444dfaae99e92819933be120aa05f9a6c32454
parent09199734d383691ecf6d163894b447ca45e0ef82 (diff)
Simplified force_bytes().
-rw-r--r--django/utils/encoding.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 4ff530c406..1a1a6d06b1 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -99,10 +99,7 @@ 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) or not isinstance(s, str):
- return str(s).encode(encoding, errors)
- else:
- return s.encode(encoding, errors)
+ return str(s).encode(encoding, errors)
smart_str = smart_text