Scrapy, a fast high-level web crawling & scraping framework for Python.
Remove code for unsupported Twisted. (#6510)
Andrey Rakhmatullinfcb5ab6cffa8
diff --git a/scrapy/mail.py b/scrapy/mail.pyindex 1e65b1623..ce7beb773 100644--- a/scrapy/mail.py+++ b/scrapy/mail.py@@ -16,10 +16,8 @@ from email.utils import formatdatefrom io import BytesIOfrom typing import IO, TYPE_CHECKING, Any-from twisted import version as twisted_versionfrom twisted.internet import sslfrom twisted.internet.defer import Deferred-from twisted.python.versions import Versionfrom scrapy.utils.misc import arg_to_iterfrom scrapy.utils.python import to_bytes@@ -217,12 +215,9 @@ class MailSender:"heloFallback": True,"requireAuthentication": False,"requireTransportSecurity": self.smtptls,+ "hostname": self.smtphost,}- # Newer versions of twisted require the hostname to use STARTTLS- if twisted_version >= Version("twisted", 21, 2, 0):- factory_keywords["hostname"] = self.smtphost-factory = ESMTPSenderFactory(self.smtpuser,self.smtppass,diff --git a/tests/test_mail.py b/tests/test_mail.pyindex ff1505397..c6af2b1b8 100644--- a/tests/test_mail.py+++ b/tests/test_mail.py@@ -2,11 +2,8 @@ import unittestfrom email.charset import Charsetfrom io import BytesIO-from twisted import version as twisted_versionfrom twisted.internet import deferfrom twisted.internet._sslverify import ClientTLSOptions-from twisted.internet.ssl import ClientContextFactory-from twisted.python.versions import Versionfrom scrapy.mail import MailSender@@ -159,10 +156,7 @@ class MailSenderTest(unittest.TestCase):)context = factory.buildProtocol("[email protected]").context- if twisted_version >= Version("twisted", 21, 2, 0):- self.assertIsInstance(context, ClientTLSOptions)- else:- self.assertIsInstance(context, ClientContextFactory)+ self.assertIsInstance(context, ClientTLSOptions)if __name__ == "__main__":