mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 02:50:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Closes #25411: Merged fix from 3.4.

Browse source
This commit is contained in:
Vinay Sajip 2015-10-17 16:17:52 +01:00
commit 3f445f799a
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/logging/handlers.py
View file

@ -965,24 +965,26 @@ class SMTPHandler(logging.Handler):
"""
try:
import smtplib
from email.utils import formatdate
from email.message import EmailMessage
import email.utils
port = self.mailport
if not port:
port = smtplib.SMTP_PORT
smtp = smtplib.SMTP(self.mailhost, port, timeout=self.timeout)
msg = self.format(record)
msg = "From: %s\r\nTo: %s\r\nSubject: %s\r\nDate: %s\r\n\r\n%s" % (
self.fromaddr,
",".join(self.toaddrs),
self.getSubject(record),
formatdate(), msg)
msg = EmailMessage()
msg['From'] = self.fromaddr
msg['To'] = ','.join(self.toaddrs)
msg['Subject'] = self.getSubject(record)
msg['Date'] = email.utils.localtime()
msg.set_content(self.format(record))
if self.username:
if self.secure is not None:
smtp.ehlo()
smtp.starttls(*self.secure)
smtp.ehlo()
smtp.login(self.username, self.password)
smtp.sendmail(self.fromaddr, self.toaddrs, msg)
smtp.send_message(msg)
smtp.quit()
except Exception:
self.handleError(record)