summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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