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

Propagate all extra fields on to the final email sending function, not only the Cc and Bcc fields.

Browse source 
- Legacy-Id: 2765
This commit is contained in:
Henrik Levkowetz 2011-01-27 15:06:53 +00:00
parent 6958488029
commit 9720c03038
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/utils/mail.py
View file

@ -146,7 +146,6 @@ def send_mail_text(request, to, frm, subject, txt, cc=None, extra=None, toUser=N
msg = MIMEText(txt.encode('utf-8'), 'plain', 'UTF-8')
else:
msg = MIMEText(txt)
send_mail_mime(request, to, frm, subject, msg, cc, extra, toUser, bcc)
def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=None, bcc=None):
@ -166,7 +165,7 @@ def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=N
msg['X-Test-IDTracker'] = (settings.SERVER_MODE == 'production') and 'no' or 'yes'
msg['X-IETF-IDTracker'] = ietf.__version__
if extra:
for k, v in extra.iteritems():
for k, v in extra.items():
msg[k] = v
if test_mode or settings.SERVER_MODE == 'production':
send_smtp(msg, bcc)
@ -187,7 +186,6 @@ def send_mail_preformatted(request, preformatted):
"""Parse preformatted string containing mail with From:, To:, ...,
and send it through the standard IETF mail interface (inserting
extra headers as needed)."""
msg = message_from_string(preformatted.encode("utf-8"))
send_mail_text(request, msg['To'], msg["From"], msg["Subject"], msg.get_payload(), cc=msg["Cc"], bcc=msg["Bcc"])
send_mail_text(request, msg['To'], msg["From"], msg["Subject"], msg.get_payload(), extra=msg)