Ticket #6840: 6840_mail_cc.diff

django/core/mail.py

@@ -189 +189 @@
     multipart_subtype = 'mixed'
     encoding = None     # None => use settings default
 
-    def __init__(self, subject='', body='', from_email=None, to=None, bcc=None,
+    def __init__(self, subject='', body='', from_email=None, to=None, cc=None, bcc=None,
             connection=None, attachments=None, headers=None):
         """
         Initialise a single email message (which can be sent to multiple
@@ -203 +203 @@
             self.to = list(to)
         else:
             self.to = []
+        if cc:
+            self.cc = list(cc)
+        else:
+            self.cc = []
         if bcc:
             self.bcc = list(bcc)
         else:
@@ -237 +241 @@
         msg['To'] = ', '.join(self.to)
         msg['Date'] = formatdate()
         msg['Message-ID'] = make_msgid()
+        if self.cc:
+            msg['Cc'] = ', '.join(self.cc)
         if self.bcc:
             msg['Bcc'] = ', '.join(self.bcc)
         for name, value in self.extra_headers.items():
@@ -248 +254 @@
         Returns a list of all recipients of the email (includes direct
         addressees as well as Bcc entries).
         """
-        return self.to + self.bcc
+        return self.to + self.cc + self.bcc
 
     def send(self, fail_silently=False):
         """Send the email message."""