From ec2550db84a5eb75b23a6f95d532d05f275ab993 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 10 Jun 2013 20:33:07 +0000 Subject: [PATCH] Merged [5613] from mcr@sandelman.ca: include a way to dump timedeltafields so that it is possible to save data to fixtures. - Legacy-Id: 5785 Note: SVN reference [5613] has been migrated to Git commit 32cb1d83e78d890cc286fb47131489a74dda4b21 --- django/core/serializers/json.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py index b8119f54d..69827e7a5 100644 --- a/django/core/serializers/json.py +++ b/django/core/serializers/json.py @@ -54,6 +54,8 @@ class DjangoJSONEncoder(simplejson.JSONEncoder): return o.strftime(self.TIME_FORMAT) elif isinstance(o, decimal.Decimal): return str(o) + elif isinstance(o, datetime.timedelta): + return o.days * 24*60*60 + o.seconds else: return super(DjangoJSONEncoder, self).default(o)