Skip to content

Commit fd98bd4

Browse files
committed
Replace use of datetime.datetime.utcfromtimestamp()
This is deprecated in Python 3.12. Signed-off-by: Stephen Finucane <stephen@that.guru>
1 parent fba72ac commit fd98bd4

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

patchwork/parser.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import codecs
77
import datetime
8+
from datetime import timezone
89
from email.header import decode_header
910
from email.header import make_header
1011
from email.utils import mktime_tz
@@ -468,7 +469,9 @@ def find_date(mail):
468469
return tz_utils.now()
469470

470471
try:
471-
d = datetime.datetime.utcfromtimestamp(mktime_tz(t))
472+
d = datetime.datetime.fromtimestamp(
473+
mktime_tz(t), tz=timezone.utc
474+
).replace(tzinfo=None)
472475
except (OverflowError, ValueError, OSError):
473476
# If you have a date like:
474477
# - Date: Wed, 4 Jun 207777777777777777777714 17:50:46 0

patchwork/views/utils.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# SPDX-License-Identifier: GPL-2.0-or-later
66

77
import datetime
8+
from datetime import timezone
89
from email.encoders import encode_7or8bit
910
from email.header import Header
1011
from email.mime.nonmultipart import MIMENonMultipart
@@ -76,7 +77,9 @@ def _submission_to_mbox(submission):
7677
if is_patch and submission.diff:
7778
body += '\n' + submission.diff
7879

79-
delta = submission.date - datetime.datetime.utcfromtimestamp(0)
80+
delta = submission.date - datetime.datetime.fromtimestamp(
81+
0, tz=timezone.utc
82+
).replace(tzinfo=None)
8083
utc_timestamp = delta.seconds + delta.days * 24 * 3600
8184

8285
mail = PatchMbox(body)

0 commit comments

Comments
 (0)