Scrapy, a fast high-level web crawling & scraping framework for Python.
Use a helper for to_bytes() and None input
Paul Tremberthf729d74886be
diff --git a/scrapy/mail.py b/scrapy/mail.pyindex 0cfb4ec79..5b944e1c4 100644--- a/scrapy/mail.py+++ b/scrapy/mail.py@@ -30,14 +30,20 @@ from scrapy.utils.python import to_byteslogger = logging.getLogger(__name__)+def _to_bytes_or_none(text):+ if text is None:+ return None+ return to_bytes(text)++class MailSender(object):def __init__(self, smtphost='localhost', mailfrom='scrapy@localhost',smtpuser=None, smtppass=None, smtpport=25, smtptls=False, smtpssl=False, debug=False):self.smtphost = smtphostself.smtpport = smtpport- self.smtpuser = to_bytes(smtpuser) if smtpuser is not None else None- self.smtppass = to_bytes(smtppass) if smtppass is not None else None+ self.smtpuser = _to_bytes_or_none(smtpuser)+ self.smtppass = _to_bytes_or_none(smtppass)self.smtptls = smtptlsself.smtpssl = smtpsslself.mailfrom = mailfrom