Ticket #7722: mail.diff

django/core/mail.py

@@ -194 +194 @@
     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):
         """
         Initialize a single email message (which can be sent to multiple
@@ -208 +208 @@
             self.to = list(to)
         else:
             self.to = []
+        if cc:
+                        self.cc = list(cc)
+                else:
+                        self.cc = []
         if bcc:
             self.bcc = list(bcc)
         else:
@@ -241 +245 @@
         msg['Subject'] = self.subject
         msg['From'] = self.from_email
         msg['To'] = ', '.join(self.to)
+        if not self.cc == None:
+            msg['Cc'] = ', '.join(self.cc)
         msg['Date'] = formatdate()
         msg['Message-ID'] = make_msgid()
         for name, value in self.extra_headers.items():
@@ -250 +256 @@
     def recipients(self):
         """
         Returns a list of all recipients of the email (includes direct
-        addressees as well as Bcc entries).
+        addressees as well as Bcc and Ccentries).
         """
-        return self.to + self.bcc
+        return self.to + self.cc + self.bcc
 
     def send(self, fail_silently=False):
         """Sends the email message."""