Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion rest_framework/utils/encoders.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

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.
"""
def default(self, o):
Expand All @@ -34,6 +34,8 @@ def default(self, o):
if o.microsecond:
r = r[:12]
return r
elif isinstance(o, datetime.timedelta):
return str(o.total_seconds())
elif isinstance(o, decimal.Decimal):
return str(o)
elif hasattr(o, '__iter__'):
Expand Down