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, 2 insertions, 0 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 68929cc0e5..607b48277a 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -142,6 +142,8 @@ def force_bytes(s, encoding='utf-8', strings_only=False, errors='strict'):
If strings_only is True, don't convert (some) non-string-like objects.
"""
+ if isinstance(s, six.memoryview):
+ s = bytes(s)
if isinstance(s, bytes):
if encoding == 'utf-8':
return s