summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/request-response.txt12
-rw-r--r--docs/releases/4.1.txt3
2 files changed, 11 insertions, 4 deletions
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index f651a77c4b..3a3c4d14fc 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -853,9 +853,15 @@ Methods
Sets a cookie. The parameters are the same as in the
:class:`~http.cookies.Morsel` cookie object in the Python standard library.
- * ``max_age`` should be an integer number of seconds, or ``None`` (default)
- if the cookie should last only as long as the client's browser session.
- If ``expires`` is not specified, it will be calculated.
+ * ``max_age`` should be a :class:`~datetime.timedelta` object, an integer
+ number of seconds, or ``None`` (default) if the cookie should last only
+ as long as the client's browser session. If ``expires`` is not specified,
+ it will be calculated.
+
+ .. versionchanged:: 4.1
+
+ Support for ``timedelta`` objects was added.
+
* ``expires`` should either be a string in the format
``"Wdy, DD-Mon-YY HH:MM:SS GMT"`` or a ``datetime.datetime`` object
in UTC. If ``expires`` is a ``datetime`` object, the ``max_age``
diff --git a/docs/releases/4.1.txt b/docs/releases/4.1.txt
index 9e682e6cc2..72c1c15c7a 100644
--- a/docs/releases/4.1.txt
+++ b/docs/releases/4.1.txt
@@ -281,7 +281,8 @@ Models
Requests and Responses
~~~~~~~~~~~~~~~~~~~~~~
-* ...
+* :meth:`.HttpResponse.set_cookie` now supports :class:`~datetime.timedelta`
+ objects for the ``max_age`` argument.
Security
~~~~~~~~