Merge pull request #584 from radiosilence/master

Adding timedelta support to JSONEncoder, and an example of how to add decode support to a serializer.

Author: tomchristie

rest_framework/utils/encoders.py

@@ -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):
@@ -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__'):