dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:web2py/web2py

Browse Source
This commit is contained in:
mdipierro
2014-03-04 22:40:00 -06:00
parent d20f231b34 cc1c019216
commit 7c536b66d0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tools.py
+9 -4
View File
@@ -278,7 +278,8 @@ class Mail(object):
sender=None, sender=None,
encoding='utf-8', encoding='utf-8',
raw=False, raw=False,
headers={} headers={},
from_address=None
): ):
""" """
Sends an email using data specified in constructor Sends an email using data specified in constructor
@@ -308,8 +309,9 @@ class Mail(object):
encoding: encoding of all strings passed to this method (including encoding: encoding of all strings passed to this method (including
message bodies) message bodies)
headers: dictionary of headers to refine the headers just before headers: dictionary of headers to refine the headers just before
sending mail, e.g. {'Return-Path' : 'bounces@example.org'} sending mail, e.g. {'X-Mailer' : 'web2py mailer'}
from_address: address to appear in the 'From:' header, this is not the
envelope sender. If not specified the sender will be used
Examples: Examples:
#Send plain text message to single address: #Send plain text message to single address:
@@ -655,7 +657,10 @@ class Mail(object):
# no cryptography process as usual # no cryptography process as usual
payload = payload_in payload = payload_in
payload['From'] = encoded_or_raw(sender.decode(encoding)) if from_address:
payload['From'] = encoded_or_raw(from_address.decode(encoding))
else:
payload['From'] = encoded_or_raw(sender.decode(encoding))
origTo = to[:] origTo = to[:]
if to: if to:
payload['To'] = encoded_or_raw(', '.join(to).decode(encoding)) payload['To'] = encoded_or_raw(', '.join(to).decode(encoding))