Ticket #5852: 5852.patch

twisted/mail/test/test_smtp.py

@@ -1518 +1518 @@
         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.
+        """
+        self.assertEqual(len(self.flushWarnings([smtp.ESMTPClient.setTlsMode])), 1)    

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
@@ -1244 +1245 @@
         self.authenticators = []
         self.secret = secret
         self.context = contextFactory
-        self.tlsMode = False
+        self.setTlsMode(False)
 
 
+    def setTlsMode(self, tlsMode=False):
+        """
+        Setter method for setting tlsMode.
+        """
+        warnings.warn("tlsMode is deprecated since Twisted 12.2", category=DeprecationWarning, stacklevel=2)
+        self.tlsMode = tlsMode
+
+
     def esmtpEHLORequired(self, code=-1, resp=None):
         self.sendError(EHLORequiredError(502, "Server does not support ESMTP Authentication", self.log.str()))