Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gemato/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ def __call__(self):

LOGGER.info(f'Updating Manifests in {p}...')

start_ts = datetime.datetime.utcnow()
start_ts = datetime.datetime.now(datetime.timezone.utc)
m.update_entries_for_directory(relpath, **update_kwargs)

# write TIMESTAMP if requested, or if already there
Expand Down Expand Up @@ -509,7 +509,7 @@ def __call__(self):

LOGGER.info(f'Creating Manifests in {p}...')

start_ts = datetime.datetime.utcnow()
start_ts = datetime.datetime.now(datetime.timezone.utc)
m.update_entries_for_directory()

# write TIMESTAMP if requested
Expand Down
2 changes: 1 addition & 1 deletion gemato/openpgp.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ def verify_file(self, f):
if not vr:
raise OpenPGPVerificationFailure(
f'Bad signature made by key {k.fingerprint}')
now = datetime.datetime.utcnow()
now = datetime.datetime.now(datetime.timezone.utc)
sig_expire = msg.signatures[0].expires_at
if sig_expire is not None and sig_expire < now:
raise OpenPGPVerificationFailure(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_recursiveloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ class MismatchedFileFutureTimestampLayout(BaseLayout):
@classmethod
def create(cls, tmp_path):
super().create(tmp_path)
future_dt = (datetime.datetime.utcnow() +
future_dt = (datetime.datetime.now(datetime.timezone.utc) +
datetime.timedelta(days=1))
with open(tmp_path / 'Manifest', 'w') as f:
f.write(cls.MANIFESTS['Manifest'].replace(
Expand Down
4 changes: 2 additions & 2 deletions utils/gen_fast_metamanifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def gen_metamanifest(top_dir, pgp_key):
p.map(gen_fast_manifest.gen_manifest, manifest_dir_generator(1), chunksize=64)

# special directories: we split Manifest there, and add timestamp
ts = datetime.datetime.utcnow().strftime(
ts = datetime.datetime.now(datetime.timezone.utc).strftime(
'TIMESTAMP %Y-%m-%dT%H:%M:%SZ\n').encode('ascii')
make_toplevel('metadata/glsa', ts, pgp_key)
make_toplevel('metadata/news', ts, pgp_key)
Expand All @@ -129,7 +129,7 @@ def gen_metamanifest(top_dir, pgp_key):
p.map(gen_fast_manifest.gen_manifest, list(manifest_dir_generator(4)))

# final split
ts = datetime.datetime.utcnow().strftime(
ts = datetime.datetime.now(datetime.timezone.utc).strftime(
'TIMESTAMP %Y-%m-%dT%H:%M:%SZ\n').encode('ascii')
make_toplevel('', ts, pgp_key)

Expand Down