]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
GH-103944: Check error status when raising DeprecationWarning (#103949)
authorPaul Ganssle <1377457+pganssle@users.noreply.github.com>
Fri, 28 Apr 2023 19:44:13 +0000 (13:44 -0600)
committerGitHub <noreply@github.com>
Fri, 28 Apr 2023 19:44:13 +0000 (15:44 -0400)
Modules/_datetimemodule.c

index d392d384c3eee6fbc999ccf208e34c44bf3f70f6..8f86fc91966205f2d09016c7f1fa9dfb54d714e5 100644 (file)
@@ -5144,13 +5144,13 @@ 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. Use timezone-aware objects to represent datetimes in UTC: "
-        "datetime.now(datetime.UTC).",
-        2
-    );
+    if (PyErr_WarnEx(PyExc_DeprecationWarning,
+        "datetime.utcnow() is deprecated and scheduled for removal in a "
+        "future version. Use timezone-aware objects to represent datetimes "
+        "in UTC: datetime.now(datetime.UTC).", 2))
+    {
+        return NULL;
+    }
     return datetime_best_possible(cls, _PyTime_gmtime, Py_None);
 }
 
@@ -5187,13 +5187,13 @@ datetime_fromtimestamp(PyObject *cls, PyObject *args, PyObject *kw)
 static PyObject *
 datetime_utcfromtimestamp(PyObject *cls, PyObject *args)
 {
-    PyErr_WarnEx(
-        PyExc_DeprecationWarning,
+    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).",
-        2
-    );
+        "datetimes in UTC: datetime.now(datetime.UTC).", 2))
+    {
+        return NULL;
+    }
     PyObject *timestamp;
     PyObject *result = NULL;