Skip to content

Commit b790781

Browse files
committed
Add return statements to remaining email sending function so it's
possibly to get the message back. We need the message and its Message-ID in the review tracking code, to be able to link to it in the mail archive. - Legacy-Id: 11359
1 parent b6e5aeb commit b790781

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

ietf/utils/mail.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def encode_message(txt):
187187
def send_mail_text(request, to, frm, subject, txt, cc=None, extra=None, toUser=False, bcc=None):
188188
"""Send plain text message."""
189189
msg = encode_message(txt)
190-
send_mail_mime(request, to, frm, subject, msg, cc, extra, toUser, bcc)
190+
return send_mail_mime(request, to, frm, subject, msg, cc, extra, toUser, bcc)
191191

192192
def condition_message(to, frm, subject, msg, cc, extra):
193193
if isinstance(frm, tuple):
@@ -284,6 +284,8 @@ def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=F
284284
build_warning_message(request, e)
285285
send_error_email(e)
286286

287+
return msg
288+
287289
def parse_preformatted(preformatted, extra={}, override={}):
288290
"""Parse preformatted string containing mail with From:, To:, ...,"""
289291
msg = message_from_string(preformatted.encode("utf-8"))
@@ -323,8 +325,8 @@ def send_mail_message(request, message, extra={}):
323325
if message.reply_to:
324326
e['Reply-to'] = message.reply_to
325327

326-
send_mail_text(request, message.to, message.frm, message.subject,
327-
message.body, cc=message.cc, bcc=message.bcc, extra=e)
328+
return send_mail_text(request, message.to, message.frm, message.subject,
329+
message.body, cc=message.cc, bcc=message.bcc, extra=e)
328330

329331
def exception_components(e):
330332
# See if it's a non-smtplib exception that we faked

0 commit comments

Comments
 (0)