Ticket #5852: 5852.2.patch

twisted/mail/smtp.py

@@ -8 +8 @@
 
 import time, re, base64, types, socket, os, random, rfc822
 import binascii
+import warnings
 from email.base64MIME import encode as encode_base64
 
 from zope.interface import implements, Interface
@@ -1239 +1240 @@
     # ClientContextFactory to use for STARTTLS
     context = None
 
+
+    def __setattr__(self, name, val):
+        if name == 'tlsMode':
+            warnings.warn("tlsMode attribute of twisted.mail.smtp.ESMTPClient is deprecated since Twisted 12.2", category=DeprecationWarning, stacklevel=2)
+        self.__dict__[name] = val
+
+     
     def __init__(self, secret, contextFactory=None, *args, **kw):
         SMTPClient.__init__(self, *args, **kw)
         self.authenticators = []

twisted/mail/test/test_smtp.py

@@ -609 +609 @@
     def test_loginAuth(self):
         """
         L{ESMTPClient} can authenticate using the I{LOGIN} SASL mechanism.
+        
 
         @see: U{http://sepp.oetiker.ch/sasl-2.1.19-ds/draft-murchison-sasl-login-00.txt}
         """
@@ -1518 +1519 @@
         client.sentMail(199, "Test response", 1, addresses, client.log)
 
         return onDone
+
+
+
+class DeprecationTests(unittest.TestCase):
+    """
+    Test for deprecations.
+    """
+
+
+    def test_esmtpClientTlsModeDeprecation(self):
+        """
+        Test deprecation of ESMTPClient.tlsMode.
+        """
+        import warnings
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("default")
+            from twisted.mail.smtp import ESMTPClient
+            client = ESMTPClient('', '', '')
+            self.assertEqual(len(w), 1)
+            self.assertIdentical(w[-1].category, DeprecationWarning)
+            self.assertEqual(str(w[-1].message), "tlsMode attribute of twisted.mail.smtp.ESMTPClient is deprecated since Twisted 12.2")

twisted/mail/topfiles/5852.removal

@@ +1 @@
+tlsMode attribute of twisted.mail.smtp.ESMTPClient is deprecated since Twisted 12.2.