Ticket #6918: mail_patch.diff

django/core/mail.py

@@ -195 +195 @@
     encoding = None     # None => use settings default
 
     def __init__(self, subject='', body='', from_email=None, to=None, bcc=None,
-            connection=None, attachments=None, headers=None):
+            connection=None, attachments=None, headers=None, encoding=None):
         """
         Initialize a single email message (which can be sent to multiple
         recipients).
@@ -220 +220 @@
         self.attachments = attachments or []
         self.extra_headers = headers or {}
         self.connection = connection
+        self.encoding = encoding
 
     def get_connection(self, fail_silently=False):
         if not self.connection:
@@ -318 +319 @@
         self.attach(content=content, mimetype=mimetype)
 
 def send_mail(subject, message, from_email, recipient_list,
-              fail_silently=False, auth_user=None, auth_password=None):
+              fail_silently=False, auth_user=None, auth_password=None,
+              encoding=None):
     """
     Easy wrapper for sending a single message to a recipient list. All members
     of the recipient list will see the other recipients in the 'To' field.
 
     If auth_user is None, the EMAIL_HOST_USER setting is used.
     If auth_password is None, the EMAIL_HOST_PASSWORD setting is used.
+    If encoding is None, the DEFAULT_CHARSET setting is used.
 
     Note: The API for this method is frozen. New code wanting to extend the
     functionality should use the EmailMessage class directly.
@@ -332 +335 @@
     connection = SMTPConnection(username=auth_user, password=auth_password,
                                 fail_silently=fail_silently)
     return EmailMessage(subject, message, from_email, recipient_list,
-                        connection=connection).send()
+                        connection=connection, encoding=encoding).send()
 
 def send_mass_mail(datatuple, fail_silently=False, auth_user=None,
-                   auth_password=None):
+                   auth_password=None, encoding=encoding):
     """
     Given a datatuple of (subject, message, from_email, recipient_list), sends
     each message to each recipient list. Returns the number of e-mails sent.
@@ -344 +347 @@
     If auth_user and auth_password are set, they're used to log in.
     If auth_user is None, the EMAIL_HOST_USER setting is used.
     If auth_password is None, the EMAIL_HOST_PASSWORD setting is used.
+    If encoding is None, the DEFAULT_CHARSET setting is used.
 
     Note: The API for this method is frozen. New code wanting to extend the
     functionality should use the EmailMessage class directly.
     """
     connection = SMTPConnection(username=auth_user, password=auth_password,
                                 fail_silently=fail_silently)
-    messages = [EmailMessage(subject, message, sender, recipient)
+    messages = [EmailMessage(subject, message, sender, recipient, encoding=encoding)
                 for subject, message, sender, recipient in datatuple]
     return connection.send_messages(messages)
 

docs/email.txt

@@ -245 +245 @@
       caller to ensure header names and values are in the correct format for
       an e-mail message.
 
+    * ``encoding``: The encoding of the email. Defaults to DEFAULT_CHARSET
+      setting.
+
 For example::
 
     email = EmailMessage('Hello', 'Body goes here', 'from@example.com',
                 ['to1@example.com', 'to2@example.com'], ['bcc@example.com'],
-                headers = {'Reply-To': 'another@example.com'})
+                headers = {'Reply-To': 'another@example.com'},
+                encoding = 'utf-8')
 
 The class has the following methods: