Fixed #26656 -- Added duration (timedelta) support to DjangoJSONEncoder.

2 files changed, 13 insertions, 0 deletions

diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index dc01a824e8..2056e54921 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -223,6 +223,10 @@ Serialization
   can now be customized by passing a ``cls`` keyword argument to the
   ``serializers.serialize()`` function.
 
+* :class:`~django.core.serializers.json.DjangoJSONEncoder` now serializes
+  :class:`~datetime.timedelta` objects (used by
+  :class:`~django.db.models.DurationField`).
+
 Signals
 ~~~~~~~
 
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index c08ea27977..5db5e656ec 100644
--- a/docs/topics/serialization.txt
+++ b/docs/topics/serialization.txt
@@ -297,6 +297,11 @@ The JSON serializer uses ``DjangoJSONEncoder`` for encoding. A subclass of
 :class:`~datetime.time`
    A string of the form ``HH:MM:ss.sss`` as defined in `ECMA-262`_.
 
+:class:`~datetime.timedelta`
+   A string representing a duration as defined in ISO-8601. For example,
+   ``timedelta(days=1, hours=2, seconds=3.4)`` is represented as
+   ``'P1DT02H00M03.400000S'``.
+
 :class:`~decimal.Decimal`, ``Promise`` (``django.utils.functional.lazy()`` objects), :class:`~uuid.UUID`
    A string representation of the object.
 
@@ -304,6 +309,10 @@ The JSON serializer uses ``DjangoJSONEncoder`` for encoding. A subclass of
 
     Support for ``Promise`` was added.
 
+.. versionchanged:: 1.11
+
+    Support for :class:`~datetime.timedelta` was added.
+
 .. _ecma-262: http://www.ecma-international.org/ecma-262/5.1/#sec-15.9.1.15
 
 YAML