Skip to content

Commit dceced7

Browse files
committed
tests: Avoid UTC alias
Older Pythons do not have this alias, use timezone.utc Signed-off-by: Jussi Kukkonen <jkukkonen@google.com>
1 parent de9633d commit dceced7

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

tests/generated_data/generate_md.py

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

66
import os
77
import sys
8-
from datetime import UTC, datetime
8+
from datetime import datetime, timezone
99
from typing import Dict, List, Optional
1010

1111
from securesystemslib.signer import SSlibKey, SSlibSigner
@@ -48,7 +48,7 @@
4848
}
4949
)
5050

51-
EXPIRY = datetime(2050, 1, 1, tzinfo=UTC)
51+
EXPIRY = datetime(2050, 1, 1, tzinfo=timezone.utc)
5252
OUT_DIR = "generated_data/ed25519_metadata"
5353
if not os.path.exists(OUT_DIR):
5454
os.mkdir(OUT_DIR)

tests/test_trusted_metadata_set.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55
import sys
66
import unittest
7-
from datetime import UTC, datetime
7+
from datetime import datetime, timezone
88
from typing import Callable, ClassVar, Dict, List, Optional, Tuple
99

1010
from securesystemslib.interface import (
@@ -279,7 +279,7 @@ def test_update_root_new_root_ver_same_as_trusted_root_ver(self) -> None:
279279

280280
def test_root_expired_final_root(self) -> None:
281281
def root_expired_modifier(root: Root) -> None:
282-
root.expires = datetime(1970, 1, 1, tzinfo=UTC)
282+
root.expires = datetime(1970, 1, 1, tzinfo=timezone.utc)
283283

284284
# intermediate root can be expired
285285
root = self.modify_metadata(Root.type, root_expired_modifier)
@@ -329,7 +329,7 @@ def bump_snapshot_version(timestamp: Timestamp) -> None:
329329
def test_update_timestamp_expired(self) -> None:
330330
# new_timestamp has expired
331331
def timestamp_expired_modifier(timestamp: Timestamp) -> None:
332-
timestamp.expires = datetime(1970, 1, 1, tzinfo=UTC)
332+
timestamp.expires = datetime(1970, 1, 1, tzinfo=timezone.utc)
333333

334334
# expired intermediate timestamp is loaded but raises
335335
timestamp = self.modify_metadata(
@@ -406,7 +406,7 @@ def test_update_snapshot_expired_new_snapshot(self) -> None:
406406
self.trusted_set.update_timestamp(self.metadata[Timestamp.type])
407407

408408
def snapshot_expired_modifier(snapshot: Snapshot) -> None:
409-
snapshot.expires = datetime(1970, 1, 1, tzinfo=UTC)
409+
snapshot.expires = datetime(1970, 1, 1, tzinfo=timezone.utc)
410410

411411
# expired intermediate snapshot is loaded but will raise
412412
snapshot = self.modify_metadata(
@@ -486,7 +486,7 @@ def test_update_targets_expired_new_target(self) -> None:
486486

487487
# new_delegated_target has expired
488488
def target_expired_modifier(target: Targets) -> None:
489-
target.expires = datetime(1970, 1, 1, tzinfo=UTC)
489+
target.expires = datetime(1970, 1, 1, tzinfo=timezone.utc)
490490

491491
targets = self.modify_metadata(Targets.type, target_expired_modifier)
492492
with self.assertRaises(exceptions.ExpiredMetadataError):

0 commit comments

Comments
 (0)