summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
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 d31c27fe80..470005bb46 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -122,7 +122,7 @@ def force_bytes(s, encoding='utf-8', strings_only=False, errors='strict'):
return s
else:
return s.decode('utf-8', errors).encode(encoding, errors)
- if strings_only and (s is None or isinstance(s, int)):
+ if strings_only and is_protected_type(s):
return s
if isinstance(s, Promise):
return six.text_type(s).encode(encoding, errors)