Skip to content

Commit 5fded6b

Browse files
committed
Replace deprecated datetime.utcnow()
1 parent 0e5fa06 commit 5fded6b

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

cylc/flow/wallclock.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
from calendar import timegm
1919
from datetime import datetime, timedelta, timezone
20+
from typing import Optional, Tuple
2021

2122
from metomi.isodatetime.timezone import (
2223
get_local_time_zone_format, get_local_time_zone, TimeZoneFormatMode)
@@ -74,7 +75,7 @@ def set_utc_mode(mode):
7475
_FLAGS['utc_mode'] = bool(mode)
7576

7677

77-
def now(override_use_utc=None):
78+
def now(override_use_utc: Optional[bool] = None) -> Tuple[datetime, bool]:
7879
"""Return a current-time datetime.datetime and a UTC timezone flag.
7980
8081
Keyword arguments:
@@ -85,7 +86,7 @@ def now(override_use_utc=None):
8586
8687
"""
8788
if override_use_utc or (override_use_utc is None and _FLAGS['utc_mode']):
88-
return datetime.utcnow(), False
89+
return datetime.now(timezone.utc), False
8990
else:
9091
return datetime.now(), True
9192

tests/unit/cycling/test_iso8601.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1616

17-
from datetime import datetime
17+
from datetime import (
18+
datetime,
19+
timezone,
20+
)
1821

1922
import pytest
2023
from pytest import param
@@ -892,7 +895,7 @@ def test_next_simple_no_now(set_cycling_type):
892895
point = "next(T00Z)+P1D"
893896
output = ingest_time(point, my_now)
894897

895-
current_time = datetime.utcnow()
898+
current_time = datetime.now(timezone.utc)
896899
# my_now is None, but ingest_time will have used a similar time, and
897900
# the returned value must be after current_time
898901
output_time = datetime.strptime(output, "%Y%m%dT%H%MZ")

tests/unit/tui/test_util.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
from datetime import (
1919
datetime,
20-
timedelta
20+
timedelta,
21+
timezone
2122
)
2223
from unittest.mock import Mock
2324

@@ -171,7 +172,7 @@ def test_get_task_icon(
171172
start_time = None
172173
if start_offset is not None:
173174
start_time = get_time_string(
174-
datetime.utcnow() - timedelta(seconds=start_offset)
175+
datetime.now(timezone.utc) - timedelta(seconds=start_offset)
175176
)
176177
assert (
177178
(

0 commit comments

Comments
 (0)