altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Add return statements to remaining email sending function so it's

Browse source 
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
This commit is contained in:
Ole Laursen 2016-06-14 09:54:37 +00:00
parent b6e5aebcd4
commit b790781de9
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ietf/utils/mail.py
View file

@ -187,7 +187,7 @@ def encode_message(txt):
def send_mail_text(request, to, frm, subject, txt, cc=None, extra=None, toUser=False, bcc=None):
"""Send plain text message."""
msg = encode_message(txt)
send_mail_mime(request, to, frm, subject, msg, cc, extra, toUser, bcc)
return send_mail_mime(request, to, frm, subject, msg, cc, extra, toUser, bcc)
def condition_message(to, frm, subject, msg, cc, extra):
if isinstance(frm, tuple):
@ -284,6 +284,8 @@ def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=F
build_warning_message(request, e)
send_error_email(e)
return msg
def parse_preformatted(preformatted, extra={}, override={}):
"""Parse preformatted string containing mail with From:, To:, ...,"""
msg = message_from_string(preformatted.encode("utf-8"))
@ -323,8 +325,8 @@ def send_mail_message(request, message, extra={}):
if message.reply_to:
e['Reply-to'] = message.reply_to
send_mail_text(request, message.to, message.frm, message.subject,
message.body, cc=message.cc, bcc=message.bcc, extra=e)
return send_mail_text(request, message.to, message.frm, message.subject,
message.body, cc=message.cc, bcc=message.bcc, extra=e)
def exception_components(e):
# See if it's a non-smtplib exception that we faked