From cf2811d1580505b3469be27ee3deefada037baef Mon Sep 17 00:00:00 2001
From: Milo Toor <mtoor@omicia.com>
Date: Fri, 11 Apr 2014 16:43:48 -0700
Subject: [PATCH 1/2] adds support for smtplib.SMTP_SSL

---
 envelopes/conn.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/envelopes/conn.py b/envelopes/conn.py
index b4c6cd1..6c0a22c 100644
--- a/envelopes/conn.py
+++ b/envelopes/conn.py
@@ -40,13 +40,14 @@ class SMTP(object):
     """Wrapper around :py:class:`smtplib.SMTP` class."""
 
     def __init__(self, host=None, port=25, login=None, password=None,
-                 tls=False, timeout=None):
+                 tls=False, smtps=False, timeout=None):
         self._conn = None
         self._host = host
         self._port = port
         self._login = login
         self._password = password
         self._tls = tls
+        self._smtps = smtps
         self._timeout = timeout
 
     @property
@@ -67,11 +68,13 @@ def _connect(self, replace_current=False):
             except (AttributeError, smtplib.SMTPServerDisconnected):
                 pass
 
+            protocol = smtplib.SMTP_SSL if self._smtps else smtplib.SMTP
+
             if self._timeout:
-                self._conn = smtplib.SMTP(self._host, self._port,
-                                          timeout=self._timeout)
+                self._conn = protocol(self._host, self._port,
+                                      timeout=self._timeout)
             else:
-                self._conn = smtplib.SMTP(self._host, self._port)
+                self._conn = protocol(self._host, self._port)
 
         if self._tls:
             self._conn.starttls()

From 6a4d328d897c955a8c702ac700e423c38deccf26 Mon Sep 17 00:00:00 2001
From: Milo Toor <milo.toor@gmail.com>
Date: Sat, 12 Apr 2014 01:31:14 -0700
Subject: [PATCH 2/2] added tests for smtps

---
 lib/testing.py     | 12 ++++++++++++
 tests/test_conn.py | 18 ++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/lib/testing.py b/lib/testing.py
index ebd1151..cf3b7f3 100644
--- a/lib/testing.py
+++ b/lib/testing.py
@@ -144,6 +144,12 @@ def quit(self):
         self.__append_call('quit', [], dict())
 
 
+class MockSMTPSSL(MockSMTP):
+    """A class that mocks ``smtp.SMTP_SSL``."""
+
+    default_port = smtplib.SMTP_SSL_PORT
+
+
 class BaseTestCase(object):
     """Base class for Envelopes test cases."""
 
@@ -163,10 +169,16 @@ def _patch_smtplib(self):
         self._orig_smtp = smtplib.SMTP
         smtplib.SMTP = MockSMTP
 
+        self._orig_smtp_ssl = smtplib.SMTP_SSL
+        smtplib.SMTP_SSL = MockSMTPSSL
+
     def _unpatch_smtplib(self):
         if hasattr(self, '_orig_smtp'):
             smtplib.SMTP = self._orig_smtp
 
+        if hasattr(self, '_orig_smtp_ssl'):
+            smtplib.SMTP_SSL = self._orig_smtp_ssl
+
     def _dummy_message(self):
         return dict({
             'to_addr': ('to@example.com', 'Example To'),
diff --git a/tests/test_conn.py b/tests/test_conn.py
index c9bd4d9..9d522d9 100644
--- a/tests/test_conn.py
+++ b/tests/test_conn.py
@@ -30,6 +30,7 @@
 from envelopes.conn import SMTP
 from envelopes.envelope import Envelope
 from lib.testing import BaseTestCase
+from smtplib import SMTP_PORT, SMTP_SSL_PORT
 
 
 class Test_SMTPConnection(BaseTestCase):
@@ -38,7 +39,7 @@ def setUp(self):
 
     def test_constructor(self):
         conn = SMTP('localhost', port=587, login='spam',
-                    password='eggs', tls=True, timeout=10)
+                    password='eggs', tls=True, smtps=True, timeout=10)
 
         assert conn._conn is None
         assert conn._host == 'localhost'
@@ -46,11 +47,12 @@ def test_constructor(self):
         assert conn._login == 'spam'
         assert conn._password == 'eggs'
         assert conn._tls is True
+        assert conn._smtps is True
         assert conn._timeout == 10
 
     def test_constructor_all_kwargs(self):
         conn = SMTP(host='localhost', port=587, login='spam',
-                    password='eggs', tls=True)
+                    password='eggs', tls=True, smtps=True)
 
         assert conn._conn is None
         assert conn._host == 'localhost'
@@ -58,6 +60,7 @@ def test_constructor_all_kwargs(self):
         assert conn._login == 'spam'
         assert conn._password == 'eggs'
         assert conn._tls is True
+        assert conn._smtps is True
 
     def test_connect(self):
         conn = SMTP('localhost')
@@ -89,6 +92,17 @@ def test_connect_starttls(self):
         assert conn._conn is not None
         assert len(conn._conn._call_stack.get('starttls', [])) == 1
 
+    def test_connect_smtps(self):
+        conn = SMTP('localhost', smtps=False)
+        conn._connect()
+        assert conn._conn is not None
+        assert conn._conn.default_port == SMTP_PORT
+
+        conn = SMTP('localhost', smtps=True)
+        conn._connect()
+        assert conn._conn is not None
+        assert conn._conn.default_port == SMTP_SSL_PORT
+
     def test_connect_login(self):
         conn = SMTP('localhost')
         conn._connect()