Skip to content

Commit 53ac05d

Browse files
Mansur908Mansur908
committed
change utcnow() to now(timezone.utc)
Signed-off-by: Nurgaleev_Mansur_908 <[email protected]>
1 parent 52fa73a commit 53ac05d

11 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎examples/manual_repo/basic_repo.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import os
2525
import tempfile
26-
from datetime import datetime, timedelta
26+
from datetime import datetime, timedelta, timezone
2727
from pathlib import Path
2828
from typing import Any, Dict
2929

@@ -47,7 +47,7 @@
4747

4848
def _in(days: float) -> datetime:
4949
"""Adds 'days' to now and returns datetime object w/o microseconds."""
50-
return datetime.utcnow().replace(microsecond=0) + timedelta(days=days)
50+
return datetime.now(timezone.utc).replace(microsecond=0) + timedelta(days=days)
5151

5252

5353
# Create top-level metadata

‎examples/manual_repo/hashed_bin_delegation.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import hashlib
2020
import os
2121
import tempfile
22-
from datetime import datetime, timedelta
22+
from datetime import datetime, timedelta, timezone
2323
from pathlib import Path
2424
from typing import Any, Dict, Iterator, List, Tuple
2525

@@ -38,7 +38,7 @@
3838

3939
def _in(days: float) -> datetime:
4040
"""Adds 'days' to now and returns datetime object w/o microseconds."""
41-
return datetime.utcnow().replace(microsecond=0) + timedelta(days=days)
41+
return datetime.now(timezone.utc).replace(microsecond=0) + timedelta(days=days)
4242

4343

4444
roles: Dict[str, Metadata[Targets]] = {}

‎examples/manual_repo/succinct_hash_bin_delegations.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import math
2121
import os
2222
import tempfile
23-
from datetime import datetime, timedelta
23+
from datetime import datetime, timedelta, timezone
2424
from pathlib import Path
2525
from typing import Dict, Tuple
2626

@@ -99,7 +99,7 @@ def create_key() -> Tuple[Key, SSlibSigner]:
9999
# NOTE: See "Targets" and "Targets delegation" paragraphs in 'basic_repo.py'
100100
# example for more details about the Targets object.
101101

102-
expiration_date = datetime.utcnow().replace(microsecond=0) + timedelta(days=7)
102+
expiration_date = datetime.now(timezone.utc).replace(microsecond=0) + timedelta(days=7)
103103
targets = Metadata(Targets(expires=expiration_date))
104104

105105
succinct_roles = SuccinctRoles(

‎examples/repository/_simplerepo.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import json
88
import logging
99
from collections import defaultdict
10-
from datetime import datetime, timedelta
10+
from datetime import datetime, timedelta, timezone
1111
from typing import Dict, List, Union
1212

1313
from securesystemslib import keys
@@ -130,7 +130,7 @@ def open(self, role: str) -> Metadata:
130130
def close(self, role: str, md: Metadata) -> None:
131131
"""Store a version of metadata. Handle version bumps, expiry, signing"""
132132
md.signed.version += 1
133-
md.signed.expires = datetime.utcnow() + self.expiry_period
133+
md.signed.expires = datetime.now(timezone.utc) + self.expiry_period
134134

135135
md.signatures.clear()
136136
for signer in self.signer_cache[role]:

‎examples/uploader/_localrepo.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import json
88
import logging
99
import os
10-
from datetime import datetime, timedelta
10+
from datetime import datetime, timedelta, timezone
1111
from typing import Dict
1212

1313
import requests
@@ -77,7 +77,7 @@ def open(self, role: str) -> Metadata:
7777
def close(self, role: str, md: Metadata) -> None:
7878
"""Store a version of metadata. Handle version bumps, expiry, signing"""
7979
md.signed.version += 1
80-
md.signed.expires = datetime.utcnow() + self.expiry_period
80+
md.signed.expires = datetime.now(timezone.utc) + self.expiry_period
8181

8282
with open(f"{self.key_dir}/{role}", "rt", encoding="utf-8") as f:
8383
signer = SSlibSigner(json.loads(f.read()))

‎tests/repository_simulator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def __init__(self) -> None:
124124

125125
self.fetch_tracker = FetchTracker()
126126

127-
now = datetime.datetime.utcnow()
127+
now = datetime.datetime.now(datetime.timezone.utc)
128128
self.safe_expiry = now.replace(microsecond=0) + datetime.timedelta(
129129
days=30
130130
)

‎tests/test_api.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import tempfile
1515
import unittest
1616
from copy import copy, deepcopy
17-
from datetime import datetime, timedelta
17+
from datetime import datetime, timedelta, timezone
1818
from pathlib import Path
1919
from typing import Any, ClassVar, Dict, Optional
2020

@@ -326,10 +326,10 @@ def test_metadata_signed_is_expired(self) -> None:
326326
# Test is_expired without reference_time,
327327
# manipulating md.signed.expires
328328
expires = md.signed.expires
329-
md.signed.expires = datetime.utcnow()
329+
md.signed.expires = datetime.now(timezone.utc)
330330
is_expired = md.signed.is_expired()
331331
self.assertTrue(is_expired)
332-
md.signed.expires = datetime.utcnow() + timedelta(days=1)
332+
md.signed.expires = datetime.now(timezone.utc) + timedelta(days=1)
333333
is_expired = md.signed.is_expired()
334334
self.assertFalse(is_expired)
335335
md.signed.expires = expires

‎tests/test_updater_top_level_update.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class TestRefresh(unittest.TestCase):
4343
# set dump_dir to trigger repository state dumps
4444
dump_dir: Optional[str] = None
4545

46-
past_datetime = datetime.datetime.utcnow().replace(
46+
past_datetime = datetime.datetime.now(datetime.timezone.utc).replace(
4747
microsecond=0
4848
) - datetime.timedelta(days=5)
4949

@@ -320,7 +320,7 @@ def test_expired_timestamp_version_rollback(self, mock_time: Mock) -> None:
320320
- Second updater refresh performed on day 18:
321321
assert that rollback check uses expired timestamp v1"""
322322

323-
now = datetime.datetime.utcnow()
323+
now = datetime.datetime.now(datetime.timezone.utc)
324324
self.sim.timestamp.expires = now + datetime.timedelta(days=7)
325325

326326
self.sim.timestamp.version = 2
@@ -332,8 +332,8 @@ def test_expired_timestamp_version_rollback(self, mock_time: Mock) -> None:
332332

333333
self.sim.timestamp.version = 1
334334

335-
mock_time.utcnow.return_value = (
336-
datetime.datetime.utcnow() + datetime.timedelta(days=18)
335+
mock_time.now.return_value = (
336+
datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=18)
337337
)
338338
with patch("datetime.datetime", mock_time):
339339
# Check that a rollback protection is performed even if
@@ -356,7 +356,7 @@ def test_expired_timestamp_snapshot_rollback(self, mock_time: Mock) -> None:
356356
- Second updater refresh performed on day 18:
357357
assert that rollback protection is done with expired timestamp v1"""
358358

359-
now = datetime.datetime.utcnow()
359+
now = datetime.datetime.now(datetime.timezone.utc)
360360
self.sim.timestamp.expires = now + datetime.timedelta(days=7)
361361

362362
# Bump the snapshot version number to 3
@@ -371,8 +371,8 @@ def test_expired_timestamp_snapshot_rollback(self, mock_time: Mock) -> None:
371371
self.sim.update_snapshot()
372372
self.sim.timestamp.expires = now + datetime.timedelta(days=21)
373373

374-
mock_time.utcnow.return_value = (
375-
datetime.datetime.utcnow() + datetime.timedelta(days=18)
374+
mock_time.now.return_value = (
375+
datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=18)
376376
)
377377
with patch("datetime.datetime", mock_time):
378378
# Assert that rollback protection is done even if
@@ -750,7 +750,7 @@ def test_expired_metadata(self, mock_time: Mock) -> None:
750750
- Second updater refresh performed on day 18,
751751
it is successful and timestamp/snaphot final versions are v2"""
752752

753-
now = datetime.datetime.utcnow()
753+
now = datetime.datetime.now(datetime.timezone.utc)
754754
self.sim.timestamp.expires = now + datetime.timedelta(days=7)
755755

756756
# Make a successful update of valid metadata which stores it in cache
@@ -762,8 +762,8 @@ def test_expired_metadata(self, mock_time: Mock) -> None:
762762

763763
# Mocking time so that local timestam has expired
764764
# but the new timestamp has not
765-
mock_time.utcnow.return_value = (
766-
datetime.datetime.utcnow() + datetime.timedelta(days=18)
765+
mock_time.now.return_value = (
766+
datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=18)
767767
)
768768
with patch("datetime.datetime", mock_time):
769769
self._run_refresh()

‎tuf/api/_payload.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io
1111
import logging
1212
from dataclasses import dataclass
13-
from datetime import datetime
13+
from datetime import datetime, timezone
1414
from typing import (
1515
IO,
1616
Any,
@@ -82,7 +82,7 @@ def expires(self) -> datetime:
8282
"""Get the metadata expiry date.
8383
8484
# Use 'datetime' module to e.g. expire in seven days from now
85-
obj.expires = utcnow() + timedelta(days=7)
85+
obj.expires = now(timezone.utc) + timedelta(days=7)
8686
"""
8787
return self._expires
8888

@@ -115,7 +115,7 @@ def __init__(
115115

116116
self.spec_version = spec_version
117117

118-
self.expires = expires or datetime.utcnow()
118+
self.expires = expires or datetime.now(timezone.utc)
119119

120120
if version is None:
121121
version = 1
@@ -205,7 +205,7 @@ def is_expired(self, reference_time: Optional[datetime] = None) -> bool:
205205
``True`` if expiration time is less than the reference time.
206206
"""
207207
if reference_time is None:
208-
reference_time = datetime.utcnow()
208+
reference_time = datetime.now(timezone.utc)
209209

210210
return reference_time >= self.expires
211211

‎tuf/api/metadata.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class Metadata(Generic[T]):
9898
9999
New Metadata instances can be created from scratch with::
100100
101-
one_day = datetime.utcnow() + timedelta(days=1)
101+
one_day = datetime.now(timezone.utc) + timedelta(days=1)
102102
timestamp = Metadata(Timestamp(expires=one_day))
103103
104104
Apart from ``expires`` all of the arguments to the inner constructors have

0 commit comments

Comments
 (0)