Ticket #3366: 3366.3.diff

django/core/mail.py

@@ -1 @@
-
+
+
+
-
-from django.conf import settings
-from email.MIMEText import MIMEText
@@ -34 +36 @@
-            val = Header(val, settings.DEFAULT_CHARSET)
-        MIMEText.__setitem__(self, name, val)
-
+class EmailConnection(object):
+    """An SMTP connection."""
+
+    def __init__(self, host=None, port=None, username=None, password=None,
+                 fail_silently=False):
+        if host is None:
+            self.host = settings.EMAIL_HOST
+        if port is None:
+            self.port = settings.EMAIL_PORT
+        if username is None:
+                self.username = settings.EMAIL_HOST_USER
+        if password is None:
+                self.password = settings.EMAIL_HOST_PASSWORD
+        self.fail_silently = fail_silently
+        self.connection = None
+
+    def open(self):
+        """Open the connection to the email server."""
+
+        # Nothing to do if the connection is already open.
+        if self.connection:
+            return
+        try:
+            self.connection = smtplib.SMTP(self.host, self.port)
+            if self.username and self.password:
+                self.connection.login(self.username, self.password)
+        except:
+            if self.fail_silently:
+                return
+            raise
+
+    def close(self):
+        """Close the connection to the email server."""
+
+        # Python versions < 2.5 do not allow try...except...finally,
+        # so we nest a try...except in a try...finally here for backwards
+        # compatibility.
+        try:
+            try:
+                self.connection.quit()
+            except:
+                if self.fail_silently:
+                    return
+                raise
+        finally:
+            self.connection = None
+
+    def send_messages(self, email_messages):
+        """
+        Send one or more EmailMessage objects and return the number of email
+        messages sent.
+        """
+
+        if not email_messages:
+            return
+        self.open()
+        num_sent = 0
+        for message in email_messages:
+            sent = self._send(message)
+            if sent:
+                num_sent += 1
+        self.close()
+        return num_sent
+
+    def _send(self, email_message):
+        """A helper method that does the actual sending."""
+
+        if not email_message.to:
+            return False
+        msg = SafeMIMEText(email_message.body, 'plain',
+                           settings.DEFAULT_CHARSET)
+        msg['Subject'] = email_message.subject
+        msg['From'] = email_message.from_email
+        msg['To'] = ', '.join(email_message.to)
+        msg['Date'] = formatdate()
+        msg['Message-ID'] = self._message_id()
+        try:
+            self.connection.sendmail(email_message.from_email,
+                                     email_message.to, msg.as_string())
+        except:
+            if not self.fail_silently:
+                raise
+        return True
+
+    def _message_id(self):
+        """Generate a message ID."""
+
+        # Python 2.3 doesn't have random.getrandbits().
+        try:
+            random_bits = str(random.getrandbits(64))
+        except AttributeError:
+            random_bits = ''.join([random.choice('1234567890') for i in range(19)])
+        return "<%d.%s@%s>" % (time.time(), random_bits, DNS_NAME)
+
+class EmailMessage(object):
+    """
+    A container for email information.
+    """
+
+    def __init__(self, to=None, from_email=None, subject="", body="",
+                 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.subject = subject
+        self.body = body
+
+    def send(self, connection=None, fail_silently=False):
+        """Send the email message."""
+
+        connection = connection or EmailConnection(fail_silently=fail_silently)
+        return connection.send_messages([self])
+
-def send_mail(subject, message, from_email, recipient_list, fail_silently=False, auth_user=None, auth_password=None):
-    """
-    Easy wrapper for sending a single message to a recipient list. All members
@@ -42 +157 @@
-    If auth_user is None, the EMAIL_HOST_USER setting is used.
-    If auth_password is None, the EMAIL_HOST_PASSWORD setting is used.
-    """
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-def send_mass_mail(datatuple, fail_silently=False, auth_user=None, auth_password=None):
-    """
@@ -58 +176 @@
-    If auth_user is None, the EMAIL_HOST_USER setting is used.
-    If auth_password is None, the EMAIL_HOST_PASSWORD setting is used.
-    """
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-def mail_admins(subject, message, fail_silently=False):
-    "Sends a message to the admins, as defined by the ADMINS setting."
-
+
+
+
+
+
+
+
-
-def mail_managers(subject, message, fail_silently=False):
-    "Sends a message to the managers, as defined by the MANAGERS setting."
-
+
+
+
+
+
+
+