mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #3307 -- Added BCC support to the EmailMessage class. En-passant, fixed a

Browse Source 
number of RST formatting errors in the email docs.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick
2007-05-03 14:38:45 +00:00
parent bc6535b599
commit 5ff1d96a52
2 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
django/core/mail.py
View File

@@ -142,7 +142,8 @@ class SMTPConnection(object):
return False
try:
self.connection.sendmail(email_message.from_email,
email_message.to, email_message.message().as_string())
email_message.recipients(),
email_message.message().as_string())
except:
if not self.fail_silently:
raise
@@ -153,12 +154,10 @@ class EmailMessage(object):
"""
A container for email information.
"""
def __init__(self, subject='', body='', from_email=None, to=None, connection=None):
def __init__(self, subject='', body='', from_email=None, to=None, bcc=None, connection=None):
self.to = to or []
if from_email is None:
self.from_email = settings.DEFAULT_FROM_EMAIL
else:
self.from_email = from_email
self.bcc = bcc or []
self.from_email = from_email or settings.DEFAULT_FROM_EMAIL
self.subject = subject
self.body = body
self.connection = connection
@@ -175,8 +174,17 @@ class EmailMessage(object):
msg['To'] = ', '.join(self.to)
msg['Date'] = formatdate()
msg['Message-ID'] = make_msgid()
if self.bcc:
msg['Bcc'] = ', '.join(self.bcc)
return msg
def recipients(self):
"""
Returns a list of all recipients of the email (includes direct
addressees as well as Bcc entries).
"""
return self.to + self.bcc
def send(self, fail_silently=False):
"""Send the email message."""
return self.get_connection(fail_silently).send_messages([self])