From a3481e70d188edf846cac6244ddc7f1178c6ff50 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola' Date: Fri, 23 Mar 2012 15:07:07 +0100 Subject: [PATCH 1/2] attempt to fix asyncore buildbot failure --- Lib/test/test_asyncore.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py index 507a8daa96e..5f55df89f51 100644 --- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -741,11 +741,15 @@ class BaseTestAPI(unittest.TestCase): for x in range(20): s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.settimeout(.2) s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack('ii', 1, 0)) - s.connect(server.address) - s.close() - + try: + s.connect(server.address) + except socket.error: + pass + finally: + s.close() class TestAPI_UseSelect(BaseTestAPI): use_poll = False From ee64b28cf44c14bfa4f7626357b8d99d2110e404 Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Fri, 23 Mar 2012 14:36:22 +0000 Subject: [PATCH 2/2] Closes #14314: backported fix. --- Lib/logging/handlers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 73ce031545d..fed8c9393d6 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -857,6 +857,7 @@ class SMTPHandler(logging.Handler): self.toaddrs = toaddrs self.subject = subject self.secure = secure + self._timeout = 5.0 def getSubject(self, record): """ @@ -879,7 +880,7 @@ class SMTPHandler(logging.Handler): port = self.mailport if not port: port = smtplib.SMTP_PORT - smtp = smtplib.SMTP(self.mailhost, 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,