Skip to content
Merged
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
6 changes: 3 additions & 3 deletions public/views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import json
from datetime import datetime
from datetime import datetime, timezone
from operator import attrgetter

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

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

not_expired = Q(expires__gt=datetime.utcnow()) | Q(expires__isnull=True)
not_expired = Q(expires__gt=datetime.now(timezone.utc)) | Q(expires__isnull=True)
signatures = PGPSignature.objects.filter(not_expired, revoked__isnull=True)
edge_list = [{ 'signee': sig.signee, 'signer': sig.signer }
for sig in signatures]
Expand Down
4 changes: 2 additions & 2 deletions releng/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from base64 import b64encode
from datetime import datetime
from datetime import datetime, timezone

import pytest
from bencode import bencode
Expand All @@ -24,7 +24,7 @@ def torrent_data():
data = {
'comment': 'comment',
'created_by': 'Arch Linux',
'creation date': int(datetime.utcnow().timestamp()),
'creation date': int(datetime.now(timezone.utc).timestamp()),
'info': {
'name': 'arch.iso',
'length': 1,
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-e git+https://github.com/fredj/cssmin.git@master#egg=cssmin
Django==5.1.9
Django==5.1.10
IPy==1.1
Markdown==3.3.7
bencode.py==4.0.0
Expand Down