Ajout du champ actual_sender
darcs-hash:20070301013901-c992d-4db210749b878b8bb97d110a1361cc05b3abbccd.gz
This commit is contained in:
parent
ac838ef9f7
commit
187e2f1669
1 changed files with 8 additions and 3 deletions
|
@ -34,7 +34,7 @@ def format_sender(sender, header_charset='ISO-8859-15'):
|
||||||
return formataddr((sender_name, sender_addr))
|
return formataddr((sender_name, sender_addr))
|
||||||
|
|
||||||
|
|
||||||
def send_email(sender, recipient, subject, body, server='localhost', cc=None, debug=False):
|
def send_email(sender, recipient, subject, body, server='localhost', cc=None, debug=False, actual_sender=None):
|
||||||
"""
|
"""
|
||||||
Send an email.
|
Send an email.
|
||||||
|
|
||||||
|
@ -85,13 +85,18 @@ def send_email(sender, recipient, subject, body, server='localhost', cc=None, de
|
||||||
actual_recipient = [recipient]
|
actual_recipient = [recipient]
|
||||||
if cc: actual_recipient.append(cc)
|
if cc: actual_recipient.append(cc)
|
||||||
|
|
||||||
|
if actual_sender:
|
||||||
|
actual_sender = format_sender(actual_sender)
|
||||||
|
else:
|
||||||
|
actual_sender = sender
|
||||||
|
|
||||||
# Send the message
|
# Send the message
|
||||||
if isinstance(server, SMTP):
|
if isinstance(server, SMTP):
|
||||||
server.sendmail(sender, actual_recipient, msg.as_string())
|
server.sendmail(actual_sender, actual_recipient, msg.as_string())
|
||||||
else:
|
else:
|
||||||
smtp = SMTP()
|
smtp = SMTP()
|
||||||
smtp.connect(server)
|
smtp.connect(server)
|
||||||
smtp.sendmail(sender, actual_recipient, msg.as_string())
|
smtp.sendmail(actual_sender, actual_recipient, msg.as_string())
|
||||||
smtp.quit()
|
smtp.quit()
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue