encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-08 22:34:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow for JSON encoding of datetime.tzinfo objects

Browse Source
This commit is contained in:
Joey Wilhelm 2015-12-16 15:41:48 -07:00
parent 503687d868
commit 2c86f0f401
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/utils/encoders.py
View File

@ -47,7 +47,7 @@ class JSONEncoder(json.JSONEncoder):
elif isinstance(obj, decimal.Decimal):
# Serializers will coerce decimals to strings by default.
return float(obj)
elif isinstance(obj, uuid.UUID):
elif isinstance(obj, (datetime.tzinfo, uuid.UUID)):
return six.text_type(obj)
elif isinstance(obj, QuerySet):
return tuple(obj)