From d60386d0f5333c7fef4c5906a3358b00cf9de3bf Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 19 Aug 2016 14:47:06 -0400 Subject: [PATCH] Fixed #26571 -- Corrected recommendation for converting timestamps to tz-aware datetimes. --- docs/topics/i18n/timezones.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/topics/i18n/timezones.txt b/docs/topics/i18n/timezones.txt index e9abc22f59c..8392d0c09f2 100644 --- a/docs/topics/i18n/timezones.txt +++ b/docs/topics/i18n/timezones.txt @@ -151,10 +151,8 @@ used. backwards-compatibility with applications that still rely on local time. However, :ref:`as explained above `, this isn't entirely reliable, and you should always work with aware datetimes in UTC - in your own code. For instance, use - :meth:`~datetime.datetime.utcfromtimestamp` instead of - :meth:`~datetime.datetime.fromtimestamp` -- and don't forget to set - ``tzinfo`` to :data:`~django.utils.timezone.utc`. + in your own code. For instance, use :meth:`~datetime.datetime.fromtimestamp` + and set the ``tz`` parameter to :data:`~django.utils.timezone.utc`. Selecting the current time zone -------------------------------