Context Navigation

Ticket #26210: 26210.diff

File 26210.diff, 1.1 KB (added by Tim Graham, 9 years ago)

diff --git a/django/core/mail/backends/smtp.py b/django/core/mail/backends/smtp.py
index 432f3a6..4b05054 100644

                class EmailBackend(BaseEmailBackend):
     def open(self):
         """
+        Ensures we have a connection to the email server. Returns whether or
+        not a new connection was required (True or False).
+        Ensure an open connection to the email server. Return whether or not a
+        new connection was required (True or False) or None if an exception
+        passed silently.
         """
         if self.connection:
             # Nothing to do if the connection is already open.
-…
+               class EmailBackend(BaseEmailBackend):
             return
         with self._lock:
             new_conn_created = self.open()
             if not self.connection:
+            if not self.connection or new_conn_created is None:
                 # We failed silently on open().
                 # Trying to send would be pointless.
                 return