Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

(fixes #2272) using arg_to_iter() to wrap single values and list() to avoid consuming from generators.

Moisés Guimarães45e95b79ce17
diff --git a/scrapy/mail.py b/scrapy/mail.py
index c6339f25b..283c3b8e1 100644
--- a/scrapy/mail.py
+++ b/scrapy/mail.py
@@ -21,6 +21,8 @@ else:
from twisted.internet import defer, reactor, ssl
+from utils.misc import arg_to_iter
+
logger = logging.getLogger(__name__)
@@ -48,6 +50,10 @@ class MailSender(object):
msg = MIMEMultipart()
else:
msg = MIMENonMultipart(*mimetype.split('/', 1))
+
+ to = list(arg_to_iter(to))
+ cc = list(arg_to_iter(cc))
+
msg['From'] = self.mailfrom
msg['To'] = COMMASPACE.join(to)
msg['Date'] = formatdate(localtime=True)
diff --git a/tests/test_mail.py b/tests/test_mail.py
index bd7e49621..b139e98d8 100644
--- a/tests/test_mail.py
+++ b/tests/test_mail.py
@@ -10,7 +10,8 @@ class MailSenderTest(unittest.TestCase):
def test_send(self):
mailsender = MailSender(debug=True)
- mailsender.send(to=['[email protected]'], subject='subject', body='body', _callback=self._catch_mail_sent)
+ mailsender.send(to=['[email protected]'], subject='subject', body='body',
+ _callback=self._catch_mail_sent)
assert self.catched_msg
@@ -24,9 +25,16 @@ class MailSenderTest(unittest.TestCase):
self.assertEqual(msg.get_payload(), 'body')
self.assertEqual(msg.get('Content-Type'), 'text/plain')
+ def test_send_single_values_to_and_cc(self):
+ mailsender = MailSender(debug=True)
+ mailsender.send(to='[email protected]', subject='subject', body='body',
+ cc='[email protected]', _callback=self._catch_mail_sent)
+
def test_send_html(self):
mailsender = MailSender(debug=True)
- mailsender.send(to=['[email protected]'], subject='subject', body='<p>body</p>', mimetype='text/html', _callback=self._catch_mail_sent)
+ mailsender.send(to=['[email protected]'], subject='subject',
+ body='<p>body</p>', mimetype='text/html',
+ _callback=self._catch_mail_sent)
msg = self.catched_msg['msg']
self.assertEqual(msg.get_payload(), '<p>body</p>')
@@ -90,7 +98,8 @@ class MailSenderTest(unittest.TestCase):
mailsender = MailSender(debug=True)
mailsender.send(to=['[email protected]'], subject=subject, body=body,
- attachs=attachs, charset='utf-8', _callback=self._catch_mail_sent)
+ attachs=attachs, charset='utf-8',
+ _callback=self._catch_mail_sent)
assert self.catched_msg
self.assertEqual(self.catched_msg['subject'], subject)
@@ -99,7 +108,8 @@ class MailSenderTest(unittest.TestCase):
msg = self.catched_msg['msg']
self.assertEqual(msg['subject'], subject)
self.assertEqual(msg.get_charset(), Charset('utf-8'))
- self.assertEqual(msg.get('Content-Type'), 'multipart/mixed; charset="utf-8"')
+ self.assertEqual(msg.get('Content-Type'),
+ 'multipart/mixed; charset="utf-8"')
payload = msg.get_payload()
assert isinstance(payload, list)