File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 11import json
2- from datetime import datetime
2+ from datetime import datetime , timezone
33from operator import attrgetter
44
55from 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 ]
Original file line number Diff line number Diff line change 11from base64 import b64encode
2- from datetime import datetime
2+ from datetime import datetime , timezone
33
44import pytest
55from 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 ,
You can’t perform that action at this time.
0 commit comments