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

Merge 4fc3b1ba56 into e32aaa29b8

Browse Source
This commit is contained in:
James Cleveland 2013-01-15 05:12:18 -08:00
commit 4c0838673d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/utils/encoders.py
View File

@ -12,7 +12,7 @@ from rest_framework.serializers import DictWithMetadata, SortedDictWithMetadata
class JSONEncoder(json.JSONEncoder): class JSONEncoder(json.JSONEncoder):
""" """
JSONEncoder subclass that knows how to encode date/time, JSONEncoder subclass that knows how to encode date/time/timedelta,
decimal types, and generators. decimal types, and generators.
""" """
def default(self, o): def default(self, o):
@ -34,6 +34,8 @@ class JSONEncoder(json.JSONEncoder):
if o.microsecond: if o.microsecond:
r = r[:12] r = r[:12]
return r return r
elif isinstance(o, datetime.timedelta):
return str(o.total_seconds())
elif isinstance(o, decimal.Decimal): elif isinstance(o, decimal.Decimal):
return str(o) return str(o)
elif hasattr(o, '__iter__'): elif hasattr(o, '__iter__'):