encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-05-05 16:33:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle bytestrings in JSON. Closes #4185. (#4191)

Browse Source
This commit is contained in:
Tom Christie 2016-06-13 10:41:50 +01:00 committed by GitHub
parent bb22ab8ee7
commit 9bffd35432
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/utils/encoders.py
View File

@ -51,6 +51,9 @@ class JSONEncoder(json.JSONEncoder):
return six.text_type(obj) return six.text_type(obj)
elif isinstance(obj, QuerySet): elif isinstance(obj, QuerySet):
return tuple(obj) return tuple(obj)
elif isinstance(obj, six.binary_type):
# Best-effort for binary blobs. See #4187.
return obj.decode('utf-8')
elif hasattr(obj, 'tolist'): elif hasattr(obj, 'tolist'):
# Numpy arrays and array scalars. # Numpy arrays and array scalars.
return obj.tolist() return obj.tolist()