Scrapy, a fast high-level web crawling & scraping framework for Python.
Fix charset handling in MailSender #5096 (#5118)
Maria Mitropoulou721df895f9ea
diff --git a/scrapy/mail.py b/scrapy/mail.pyindex c11f3898d..237327451 100644--- a/scrapy/mail.py+++ b/scrapy/mail.py@@ -96,10 +96,9 @@ class MailSender:rcpts.extend(cc)msg["Cc"] = COMMASPACE.join(cc)- if charset:- msg.set_charset(charset)-if attachs:+ if charset:+ msg.set_charset(charset)msg.attach(MIMEText(body, "plain", charset or "us-ascii"))for attach_name, mimetype, f in attachs:part = MIMEBase(*mimetype.split("/"))@@ -110,7 +109,7 @@ class MailSender:)msg.attach(part)else:- msg.set_payload(body)+ msg.set_payload(body, charset)if _callback:_callback(to=to, subject=subject, body=body, cc=cc, attach=attachs, msg=msg)diff --git a/tests/test_mail.py b/tests/test_mail.pyindex 504c78486..2535e58db 100644--- a/tests/test_mail.py+++ b/tests/test_mail.py@@ -111,7 +111,7 @@ class MailSenderTest(unittest.TestCase):msg = self.catched_msg["msg"]self.assertEqual(msg["subject"], subject)- self.assertEqual(msg.get_payload(), body)+ self.assertEqual(msg.get_payload(decode=True).decode("utf-8"), body)self.assertEqual(msg.get_charset(), Charset("utf-8"))self.assertEqual(msg.get("Content-Type"), 'text/plain; charset="utf-8"')