Skip to content

Commit 486cc28

Browse files
committed
switch to timezone.utc for compatibility;
1 parent a9d7734 commit 486cc28

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

pymdoccbor/mso/issuer.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import secrets
55
import uuid
66

7+
from datetime import timezone
8+
79
from pycose.headers import Algorithm, KID
810
from pycose.keys import CoseKey, EC2Key
911
from pycose.messages import Sign1Message
@@ -137,7 +139,7 @@ def sign(
137139
:return: the signed mso
138140
:rtype: Sign1Message
139141
"""
140-
utcnow = datetime.datetime.now(datetime.UTC)
142+
utcnow = datetime.datetime.now(timezone.utc)
141143
if settings.PYMDOC_EXP_DELTA_HOURS:
142144
exp = utcnow + datetime.timedelta(
143145
hours=settings.PYMDOC_EXP_DELTA_HOURS

pymdoccbor/settings.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import datetime
22
import os
33

4+
from datetime import timezone
5+
46
COSEKEY_HAZMAT_CRV_MAP = {
57
"secp256r1": "P_256",
68
"secp384r1": "P_384",
@@ -34,11 +36,11 @@
3436
X509_ORGANIZATION_NAME = os.getenv('X509_ORGANIZATION_NAME', u"My Company")
3537
X509_COMMON_NAME = os.getenv('X509_COMMON_NAME', u"mysite.com")
3638

37-
X509_NOT_VALID_BEFORE = os.getenv('X509_NOT_VALID_BEFORE', datetime.datetime.now(datetime.UTC))
39+
X509_NOT_VALID_BEFORE = os.getenv('X509_NOT_VALID_BEFORE', datetime.datetime.now(timezone.utc))
3840
X509_NOT_VALID_AFTER_DAYS = os.getenv('X509_NOT_VALID_AFTER_DAYS', 10)
3941
X509_NOT_VALID_AFTER = os.getenv(
4042
'X509_NOT_VALID_AFTER',
41-
datetime.datetime.now(datetime.UTC) + datetime.timedelta(
43+
datetime.datetime.now(timezone.utc) + datetime.timedelta(
4244
days=X509_NOT_VALID_AFTER_DAYS
4345
)
4446
)

0 commit comments

Comments
 (0)