From 277640af0f528f71c9882a30c9325cd02b10a31a Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Sat, 17 Oct 2015 16:13:10 +0100 Subject: Closes #25411: Improved Unicode support in SMTPHandler. --- Lib/logging/handlers.py | 22 ++++++++++++---------- Lib/test/test_logging.py | 4 ++-- Misc/NEWS | 3 +++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index fda8093..13a8fb2 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -1,4 +1,4 @@ -# Copyright 2001-2013 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2015 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -18,7 +18,7 @@ Additional handlers for the logging package for Python. The core package is based on PEP 282 and comments thereto in comp.lang.python. -Copyright (C) 2001-2013 Vinay Sajip. All Rights Reserved. +Copyright (C) 2001-2015 Vinay Sajip. All Rights Reserved. To use, simply 'import logging.handlers' and log away! """ @@ -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) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index deba2e4..b17f5e5 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -935,7 +935,7 @@ class SMTPHandlerTest(BaseTest): timeout=self.TIMEOUT) self.assertEqual(h.toaddrs, ['you']) self.messages = [] - r = logging.makeLogRecord({'msg': 'Hello'}) + r = logging.makeLogRecord({'msg': 'Hello \u2713'}) self.handled = threading.Event() h.handle(r) self.handled.wait(self.TIMEOUT) # 14314: don't wait forever @@ -946,7 +946,7 @@ class SMTPHandlerTest(BaseTest): self.assertEqual(mailfrom, 'me') self.assertEqual(rcpttos, ['you']) self.assertIn('\nSubject: Log\n', data) - self.assertTrue(data.endswith('\n\nHello')) + self.assertTrue(data.endswith('\n\nHello \u2713')) h.close() def process_message(self, *args): diff --git a/Misc/NEWS b/Misc/NEWS index 23b6ebc..c6a4d3f 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -96,6 +96,9 @@ Core and Builtins Library ------- +- Issue #25411: Improved Unicode support in SMTPHandler through better use of + the email package. Thanks to user simon04 for the patch. + - Issue #25380: Fixed protocol for the STACK_GLOBAL opcode in pickletools.opcodes. -- cgit v0.12