Ticket #13142: smtp_add_ssl-v0.2.diff

smtp.py

@@ -3 +3 @@
 import smtplib
 import socket
 import threading
+from sys import version_info
 
 from django.conf import settings
 from django.core.mail.backends.base import BaseEmailBackend
@@ -13 +14 @@
     A wrapper that manages the SMTP network connection.
     """
     def __init__(self, host=None, port=None, username=None, password=None,
-                 use_tls=None, fail_silently=False, **kwargs):
+                 use_ssl=None, use_tls=None, fail_silently=False, **kwargs):
         super(EmailBackend, self).__init__(fail_silently=fail_silently)
         self.host = host or settings.EMAIL_HOST
         self.port = port or settings.EMAIL_PORT
         self.username = username or settings.EMAIL_HOST_USER
         self.password = password or settings.EMAIL_HOST_PASSWORD
+        if use_ssl is None:
+            if settings.EMAIL_USE_SSL and version_info < (2, 6):
+                self.use_ssl = False
+            self.use_ssl = settings.EMAIL_USE_SSL
         if use_tls is None:
             self.use_tls = settings.EMAIL_USE_TLS
         else:
@@ -37 +42 @@
         try:
             # If local_hostname is not specified, socket.getfqdn() gets used.
             # For performance, we use the cached FQDN for local_hostname.
-            self.connection = smtplib.SMTP(self.host, self.port,
-                                           local_hostname=DNS_NAME.get_fqdn())
+            if self.use_ssl:
+                self.connection = smtplib.SMTP_SSL(self.host, self.port,
+                        local_hostname=DNS_NAME.get_fqdn())
+            else:
+                self.connection = smtplib.SMTP(self.host, self.port,
+                        local_hostname=DNS_NAME.get_fqdn())
             if self.use_tls:
                 self.connection.ehlo()
                 self.connection.starttls()