Ticket #5852: 5852.4.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
@@ -158 +159 @@
         return '\n'.join(res)
 
 
+
 class ESMTPClientError(SMTPClientError):
     """Base class for ESMTP client errors.
     """
@@ -1009 +1011 @@
         self.code = -1
         self.log = util.LineLog(logsize)
 
+
     def sendLine(self, line):
         # Log sendLine only if you are in debug mode for performance
         if self.debug:
@@ -1247 +1250 @@
         self.tlsMode = False
 
 
+    def __setattr__(self, name, value):
+        if name == "tlsMode":
+            warnings.warn("twisted.mail.smtp.ESMTPClient is deprecated since Twisted 12.2", category=DeprecationWarning, stacklevel=2)
+        self.__dict__[name] = value
+
+
     def esmtpEHLORequired(self, code=-1, resp=None):
         self.sendError(EHLORequiredError(502, "Server does not support ESMTP Authentication", self.log.str()))
 

twisted/mail/test/test_smtp.py

@@ -6 +6 @@
 """
 
 from zope.interface import implements
+import warnings
 
 from twisted.python.util import LineLog
 from twisted.trial import unittest, util
 from twisted.protocols import basic, loopback
 from twisted.mail import smtp
+from twisted.mail.smtp import ESMTPClient
 from twisted.internet import defer, protocol, reactor, interfaces
 from twisted.internet import address, error, task
 from twisted.test.proto_helpers import StringTransport
@@ -609 +611 @@
     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}
         """
         realm = DummyRealm()
@@ -1518 +1520 @@
         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.
+        """
+        client = ESMTPClient('', '', '')
+        warningsShown = self.flushWarnings()
+        self.assertEqual(len(warningsShown), 1)
+        self.assertIdentical(warningsShown[0]['category'], DeprecationWarning)
+        self.assertEqual(warningsShown[0]['message'], 
+             "twisted.mail.smtp.ESMTPClient is deprecated since Twisted 12.2")
+
+    test_esmtpClientTlsModeDeprecation.suppress = []

twisted/mail/topfiles/5852.removal

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