summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorHasan Ramezani <hasan.r67@gmail.com>2020-05-21 20:45:39 +0200
committerGitHub <noreply@github.com>2020-05-21 20:45:39 +0200
commit643207efaebbff4e7c3ebcbf9ca49fb6197137e1 (patch)
tree00b55fc5b8e7b44da208917b4d4c060455ec46ec /docs
parentc60524c658f197f645b638f9bcc553103bfe2630 (diff)
Fixed #31608 -- Doc'd that form ISO 8601 datetime parsing always retains tzinfo.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt5
-rw-r--r--docs/releases/3.1.txt12
2 files changed, 12 insertions, 5 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 46df532859..81d188fffc 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2782,7 +2782,10 @@ Default: ``False``
A boolean that specifies if datetimes will be timezone-aware by default or not.
If this is set to ``True``, Django will use timezone-aware datetimes internally.
-Otherwise, Django will use naive datetimes in local time.
+
+When ``USE_TZ`` is False, Django will use naive datetimes in local time, except
+when parsing ISO 8601 formatted strings, where timezone information will always
+be retained if present.
See also :setting:`TIME_ZONE`, :setting:`USE_I18N` and :setting:`USE_L10N`.
diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt
index 3843de07ec..c489f9cd89 100644
--- a/docs/releases/3.1.txt
+++ b/docs/releases/3.1.txt
@@ -274,10 +274,14 @@ Forms
details.
* :class:`django.forms.DateTimeField` now accepts dates in a subset of ISO 8601
- datetime formats, including optional timezone (e.g. ``2019-10-10T06:47``,
- ``2019-10-10T06:47:23+04:00``, or ``2019-10-10T06:47:23Z``). Additionally, it
- now uses ``DATE_INPUT_FORMATS`` in addition to ``DATETIME_INPUT_FORMATS``
- when converting a field input to a ``datetime`` value.
+ datetime formats, including optional timezone, e.g. ``2019-10-10T06:47``,
+ ``2019-10-10T06:47:23+04:00``, or ``2019-10-10T06:47:23Z``. The timezone will
+ always be retained if provided, with timezone-aware datetimes being returned
+ even when :setting:`USE_TZ` is ``False``.
+
+ Additionally, ``DateTimeField`` now uses ``DATE_INPUT_FORMATS`` in addition
+ to ``DATETIME_INPUT_FORMATS`` when converting a field input to a ``datetime``
+ value.
* :attr:`.MultiWidget.widgets` now accepts a dictionary which allows
customizing subwidget ``name`` attributes.