Deprecate utcnow and utcfromtimestamp

pganssle · pganssle · commit 1e459ae7c20a · 2023-04-26T09:58:16.000-06:00
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
@@ -896,6 +896,10 @@ Other constructors, all class methods:
       in UTC. As such, the recommended way to create an object representing the
       current time in UTC is by calling ``datetime.now(timezone.utc)``.
 
+   .. deprecated:: 3.12
+
+      Use :meth:`datetime.now` with :attr:`UTC` instead.
+
 
 .. classmethod:: datetime.fromtimestamp(timestamp, tz=None)
 
@@ -964,6 +968,10 @@ Other constructors, all class methods:
       :c:func:`gmtime` function. Raise :exc:`OSError` instead of
       :exc:`ValueError` on :c:func:`gmtime` failure.
 
+   .. deprecated:: 3.12
+
+      Use :meth:`datetime.fromtimestamp` with :attr:`UTC` instead.
+
 
 .. classmethod:: datetime.fromordinal(ordinal)
 
diff --git a/Lib/datetime.py b/Lib/datetime.py
@@ -1801,6 +1801,14 @@ def fromtimestamp(cls, timestamp, tz=None):
     @classmethod
     def utcfromtimestamp(cls, t):
         """Construct a naive UTC datetime from a POSIX timestamp."""
+        import warnings
+        warnings.warn("datetime.utcfromtimestamp() is deprecated and scheduled "
+                      "for removal in a future version. It is instead "
+                      "recommended that users use timezone-aware objects to "
+                      "represent datetimes in UTC. To get such an object from "
+                      "a timestamp, use datetime.fromtimestamp(t, datetime.UTC)",
+                      DeprecationWarning,
+                      stacklevel=2)
         return cls._fromtimestamp(t, True, None)
 
     @classmethod
@@ -1812,8 +1820,16 @@ def now(cls, tz=None):
     @classmethod
     def utcnow(cls):
         "Construct a UTC datetime from time.time()."
+        import warnings
+        warnings.warn("datetime.utcnow() is deprecated and scheduled for "
+                      "removal in a future version. It is instead recommended "
+                      "that users use timezone-aware objects to represent "
+                      "datetimes in UTC. To get such an object representing "
+                      "the current time, use datetime.now(datetime.UTC)",
+                      DeprecationWarning,
+                      stacklevel=2)
         t = _time.time()
-        return cls.utcfromtimestamp(t)
+        return cls._fromtimestamp(t, True, None)
 
     @classmethod
     def combine(cls, date, time, tzinfo=True):
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
@@ -5144,6 +5144,14 @@ datetime_datetime_now_impl(PyTypeObject *type, PyObject *tz)
 static PyObject *
 datetime_utcnow(PyObject *cls, PyObject *dummy)
 {
+    PyErr_WarnEx(
+        PyExc_DeprecationWarning,
+        "datetime.utcnow() is deprecated and scheduled for removal in a future "
+        "version. It is instead recommended that users use timezone-aware "
+        "objects to represent datetimes in UTC. To get such an object "
+        "representing the current time, use datetime.now(datetime.UTC)",
+        2
+    );
     return datetime_best_possible(cls, _PyTime_gmtime, Py_None);
 }
 
@@ -5180,6 +5188,14 @@ datetime_fromtimestamp(PyObject *cls, PyObject *args, PyObject *kw)
 static PyObject *
 datetime_utcfromtimestamp(PyObject *cls, PyObject *args)
 {
+    PyErr_WarnEx(
+        PyExc_DeprecationWarning,
+        "datetime.utcfromtimestamp() is deprecated and scheduled for removal "
+        "in a future version. It is instead recommended that users use "
+        "timezone-aware objects to represent datetimes in UTC. To get such an "
+        "object from a timestamp, use datetime.fromtimestamp(t, datetime.UTC)",
+        2
+    );
     PyObject *timestamp;
     PyObject *result = NULL;
 
