Merge pull request #2430 from Polyconseil/fbochu/timedelta-json-serialiser-python26-support

tomchristie · tomchristie · commit b3a0a2794bca · 2015-01-19T12:15:02.000Z
Fix timedelta JSON serialization on Python 2.6.
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
@@ -33,6 +33,14 @@ def unicode_to_repr(value):
     return value
 
 
+def total_seconds(timedelta):
+    # TimeDelta.total_seconds() is only available in Python 2.7
+    if hasattr(timedelta, 'total_seconds'):
+        return timedelta.total_seconds()
+    else:
+        return (timedelta.days * 86400.0) + float(timedelta.seconds) + (timedelta.microseconds / 1000000.0)
+
+
 # OrderedDict only available in Python 2.7.
 # This will always be the case in Django 1.7 and above, as these versions
 # no longer support Python 2.6.
diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
@@ -6,7 +6,7 @@
 from django.utils import six, timezone
 from django.utils.encoding import force_text
 from django.utils.functional import Promise
-from rest_framework.compat import OrderedDict
+from rest_framework.compat import OrderedDict, total_seconds
 from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList
 import datetime
 import decimal
@@ -41,7 +41,7 @@ def default(self, obj):
                 representation = representation[:12]
             return representation
         elif isinstance(obj, datetime.timedelta):
-            return six.text_type(obj.total_seconds())
+            return six.text_type(total_seconds(obj))
         elif isinstance(obj, decimal.Decimal):
             # Serializers will coerce decimals to strings by default.
             return float(obj)
