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 1
1
import json
2
- from datetime import datetime
2
+ from datetime import datetime , timezone
3
3
from operator import attrgetter
4
4
5
5
from django .contrib .auth .models import User
@@ -99,7 +99,7 @@ def keys(request):
99
99
user_key_ids = frozenset (user .userprofile .pgp_key [- 16 :] for user in users
100
100
if user .userprofile .pgp_key )
101
101
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 )
103
103
master_keys = MasterKey .objects .select_related ('owner' , 'revoker' ,
104
104
'owner__userprofile' , 'revoker__userprofile' ).filter (
105
105
revoked__isnull = True )
@@ -155,7 +155,7 @@ def keys_json(request):
155
155
'group' : 'master'
156
156
} for key in master_keys )
157
157
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 )
159
159
signatures = PGPSignature .objects .filter (not_expired , revoked__isnull = True )
160
160
edge_list = [{ 'signee' : sig .signee , 'signer' : sig .signer }
161
161
for sig in signatures ]
Original file line number Diff line number Diff line change 1
1
from base64 import b64encode
2
- from datetime import datetime
2
+ from datetime import datetime , timezone
3
3
4
4
import pytest
5
5
from bencode import bencode
@@ -24,7 +24,7 @@ def torrent_data():
24
24
data = {
25
25
'comment' : 'comment' ,
26
26
'created_by' : 'Arch Linux' ,
27
- 'creation date' : int (datetime .utcnow ( ).timestamp ()),
27
+ 'creation date' : int (datetime .now ( timezone . utc ).timestamp ()),
28
28
'info' : {
29
29
'name' : 'arch.iso' ,
30
30
'length' : 1 ,
You can’t perform that action at this time.
0 commit comments