Skip to content

Commit 94171e2

Browse files
committed
Try fixing Django6.0
1 parent 1045cd8 commit 94171e2

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

django_mailbox/models.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from email.encoders import encode_base64
88
from email.message import Message as EmailMessage
99
from email.utils import formatdate, parseaddr
10+
from email.policy import compat32
1011
from urllib.parse import parse_qs, unquote, urlparse
1112
from quopri import encode as encode_quopri
1213
from io import BytesIO
@@ -437,12 +438,9 @@ def _process_message(self, message):
437438
return None
438439
msg.set_body(body)
439440
if message['in-reply-to']:
440-
try:
441-
msg.in_reply_to = Message.objects.filter(
442-
message_id=message['in-reply-to'].strip()
443-
)[0]
444-
except IndexError:
445-
pass
441+
msg.in_reply_to = Message.objects.filter(
442+
message_id=message['in-reply-to'].strip()
443+
).first()
446444
msg.save()
447445
return msg
448446

@@ -674,9 +672,11 @@ def reply(self, message):
674672
message.extra_headers['Date'] = formatdate()
675673
message.extra_headers['In-Reply-To'] = self.message_id.strip()
676674
message.send()
675+
677676
return self.mailbox.record_outgoing_message(
678677
email.message_from_string(
679-
message.message().as_string()
678+
message.message().as_string(),
679+
policy=compat32,
680680
)
681681
)
682682

setup.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@
22
norecursedirs=env docs lib .eggs
33
DJANGO_SETTINGS_MODULE=django_mailbox.tests.settings
44
addopts = --tb=short -rxs
5+
6+
[tool:pytest]
7+
norecursedirs=env docs lib .eggs
8+
DJANGO_SETTINGS_MODULE=django_mailbox.tests.settings
9+
addopts = --tb=short -rxs

0 commit comments

Comments
 (0)