8000 Adjust message to be less wordy · python/cpython@b223173 · GitHub
[go: up one dir, main page]

Skip to content

Commit b223173

Browse files
committed
Adjust message to be less wordy
1 parent 97eff7f commit b223173

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

Lib/datetime.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,10 +1803,9 @@ def utcfromtimestamp(cls, t):
18031803
"""Construct a naive UTC datetime from a POSIX timestamp."""
18041804
import warnings
18051805
warnings.warn("datetime.utcfromtimestamp() is deprecated and scheduled "
1806-
"for removal in a future version. It is instead "
1807-
"recommended that users use timezone-aware objects to "
1808-
"represent datetimes in UTC. To get such an object from "
1809-
"a timestamp, use datetime.fromtimestamp(t, datetime.UTC).",
1806+
"for removal in a future version. Use timezone-aware "
1807+
"objects to represent datetimes in UTC: "
1808+
"datetime.fromtimestamp(t, datetime.UTC).",
18101809
DeprecationWarning,
18111810
stacklevel=2)
18121811
return cls._fromtimestamp(t, True, None)
@@ -1822,10 +1821,9 @@ def utcnow(cls):
18221821
"Construct a UTC datetime from time.time()."
18231822
import warnings
18241823
warnings.warn("datetime.utcnow() is deprecated and scheduled for "
1825-
"removal in a future version. It is instead recommended "
1826-
"that users use timezone-aware objects to represent "
1827-
"datetimes in UTC. To get such an object representing "
1828-
"the current time, use datetime.now(datetime.UTC).",
1824+
"removal in a future version. Instead, Use timezone-aware "
1825+
"objects to represent datetimes in UTC: "
1826+
"datetime.now(datetime.UTC).",
18291827
DeprecationWarning,
18301828
stacklevel=2)
18311829
t = _time.time()

Modules/_datetimemodule.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5147,9 +5147,8 @@ datetime_utcnow(PyObject *cls, PyObject *dummy)
51475147
PyErr_WarnEx(
51485148
PyExc_DeprecationWarning,
51495149
"datetime.utcnow() is deprecated and scheduled for removal in a future "
5150-
"version. It is instead recommended that users use timezone-aware "
5151-
"objects to represent datetimes in UTC. To get such an object "
5152-
"representing the current time, use datetime.now(datetime.UTC).",
5150+
"version. Use timezone-aware objects to represent datetimes in UTC: "
5151+
"datetime.now(datetime.UTC).",
51535152
2
51545153
);
51555154
return datetime_best_possible(cls, _PyTime_gmtime, Py_None);
@@ -5191,9 +5190,8 @@ datetime_utcfromtimestamp(PyObject *cls, PyObject *args)
51915190
PyErr_WarnEx(
51925191
PyExc_DeprecationWarning,
51935192
"datetime.utcfromtimestamp() is deprecated and scheduled for removal "
5194-
"in a future version. It is instead recommended that users use "
5195-
"timezone-aware objects to represent datetimes in UTC. To get such an "
5196-
"object from a timestamp, use datetime.fromtimestamp(t, datetime.UTC).",
5193+
"in a future version. Use timezone-aware objects to represent "
5194+
"datetimes in UTC: datetime.now(datetime.UTC).",
51975195
2
51985196
);
51995197
PyObject *timestamp;

0 commit comments

Comments
 (0)
0