From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Sun, 21 May 2023 19:45:44 +0000 (+0300)
Subject: gh-103857: Document utcnow and utcfromtimestamp deprecations in What's New (#104542)
X-Git-Tag: v3.12.0b1~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5841fbc1a2aa5dd9e1c3d8d369f2bba8a99b285b;p=thirdparty%2FPython%2Fcpython.git

gh-103857: Document utcnow and utcfromtimestamp deprecations in What's New (#104542)

Co-authored-by: Paul Ganssle <1377457+pganssle@users.noreply.github.com>
---

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 8a0a59ba7301..14f03ef755c7 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -774,6 +774,16 @@ Deprecated
   ``int``, convert to int explicitly with ``~int(x)``. (Contributed by Tim Hoffmann
   in :gh:`103487`.)
 
+* :class:`datetime.datetime`'s
+  :meth:`~datetime.datetime.utcnow` and
+  :meth:`~datetime.datetime.utcfromtimestamp` are deprecated and will be
+  removed in a future version. Instead, use timezone-aware objects to represent
+  datetimes in UTC: respectively, call
+  :meth:`~datetime.datetime.now` and
+  :meth:`~datetime.datetime.fromtimestamp`  with the *tz* parameter set to
+  :attr:`datetime.UTC`.
+  (Contributed by Paul Ganssle in :gh:`103857`.)
+
 Pending Removal in Python 3.13
 ------------------------------
 
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 8b417bdd0fb5..19e11780ec6e 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -5190,7 +5190,7 @@ datetime_utcfromtimestamp(PyObject *cls, PyObject *args)
     if (PyErr_WarnEx(PyExc_DeprecationWarning,
         "datetime.utcfromtimestamp() is deprecated and scheduled for removal "
         "in a future version. Use timezone-aware objects to represent "
-        "datetimes in UTC: datetime.now(datetime.UTC).", 1))
+        "datetimes in UTC: datetime.fromtimestamp(timestamp, datetime.UTC).", 1))
     {
         return NULL;
     }