Skip to content

Commit 4c57725

Browse files
committed
treewide: port away from deprecated datetime.utcnow()
1 parent 8ded12a commit 4c57725

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

public/views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import json
2-
from datetime import datetime
2+
from datetime import datetime, timezone
33
from operator import attrgetter
44

55
from django.contrib.auth.models import User
@@ -99,7 +99,7 @@ def keys(request):
9999
user_key_ids = frozenset(user.userprofile.pgp_key[-16:] for user in users
100100
if user.userprofile.pgp_key)
101101

102-
not_expired = Q(expires__gt=datetime.utcnow()) | Q(expires__isnull=True)
102+
not_expired = Q(expires__gt=datetime.now(timezone.utc)) | Q(expires__isnull=True)
103103
master_keys = MasterKey.objects.select_related('owner', 'revoker',
104104
'owner__userprofile', 'revoker__userprofile').filter(
105105
revoked__isnull=True)
@@ -155,7 +155,7 @@ def keys_json(request):
155155
'group': 'master'
156156
} for key in master_keys)
157157

158-
not_expired = Q(expires__gt=datetime.utcnow()) | Q(expires__isnull=True)
158+
not_expired = Q(expires__gt=datetime.now(timezone.utc)) | Q(expires__isnull=True)
159159
signatures = PGPSignature.objects.filter(not_expired, revoked__isnull=True)
160160
edge_list = [{ 'signee': sig.signee, 'signer': sig.signer }
161161
for sig in signatures]

releng/tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from base64 import b64encode
2-
from datetime import datetime
2+
from datetime import datetime, timezone
33

44
import pytest
55
from bencode import bencode
@@ -24,7 +24,7 @@ def torrent_data():
2424
data = {
2525
'comment': 'comment',
2626
'created_by': 'Arch Linux',
27-
'creation date': int(datetime.utcnow().timestamp()),
27+
'creation date': int(datetime.now(timezone.utc).timestamp()),
2828
'info': {
2929
'name': 'arch.iso',
3030
'length': 1,

0 commit comments

Comments
 (0)