Skip to content

Commit eec935e

Browse files
committed
Fix deprecated datetime.datetime.utcnow() usage
DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC). Signed-off-by: Zac Medico <[email protected]>
1 parent c7d5d4e commit eec935e

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

lib/portage/repository/storage/hardlink_rcu.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,11 @@ async def garbage_collection(self):
266266
st = os.stat(snap_path)
267267
except OSError:
268268
continue
269-
snap_timestamp = datetime.datetime.utcfromtimestamp(st.st_mtime)
270-
if (datetime.datetime.utcnow() - snap_timestamp) < snap_ttl:
269+
snap_timestamp = datetime.datetime.fromtimestamp(
270+
st.st_mtime, tz=datetime.timezone.utc
271+
)
272+
if (
273+
datetime.datetime.now(datetime.timezone.utc) - snap_timestamp
274+
) < snap_ttl:
271275
continue
272276
await self._check_call(["rm", "-rf", snap_path])

lib/portage/sync/modules/rsync/rsync.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,11 @@ def update(self):
437437
raise RuntimeError("Timestamp not found in Manifest")
438438
if (
439439
self.max_age != 0
440-
and (datetime.datetime.utcnow() - ts.ts).days > self.max_age
440+
and (
441+
datetime.datetime.now(datetime.timezone.utc)
442+
- ts.ts.replace(tzinfo=datetime.timezone.utc)
443+
).days
444+
> self.max_age
441445
):
442446
out.quiet = False
443447
out.ewarn(

lib/portage/tests/sync/test_sync_local.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def bump_timestamp():
141141
)
142142
)
143143

144-
bump_timestamp.timestamp = datetime.datetime.utcnow()
144+
bump_timestamp.timestamp = datetime.datetime.now(datetime.timezone.utc)
145145

146146
bump_timestamp_cmds = ((homedir, bump_timestamp),)
147147

0 commit comments

Comments
 (0)