encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-29 21:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1920 from thedrow/topic/encoder-improvements

Browse Source 
The JSON encoder now uses tuples instead of lists
This commit is contained in:
Tom Christie 2014-10-09 08:31:46 +01:00
commit 87fdc73f64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/utils/encoders.py
View File

@ -45,7 +45,7 @@ class JSONEncoder(json.JSONEncoder):
# Serializers will coerce decimals to strings by default.
return float(obj)
elif isinstance(obj, QuerySet):
return list(obj)
return tuple(obj)
elif hasattr(obj, 'tolist'):
# Numpy arrays and array scalars.
return obj.tolist()
@ -55,7 +55,7 @@ class JSONEncoder(json.JSONEncoder):
except:
pass
elif hasattr(obj, '__iter__'):
return [item for item in obj]
return tuple(item for item in obj)
return super(JSONEncoder, self).default(obj)