merge
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index d0e1425..9c63797 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -872,7 +872,7 @@
A handler class which sends an SMTP email for each logging event.
"""
def __init__(self, mailhost, fromaddr, toaddrs, subject,
- credentials=None, secure=None, timeout=1.0):
+ credentials=None, secure=None, timeout=5.0):
"""
Initialize the handler.
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index edcefa1..75b3e4d 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -930,7 +930,7 @@
sockmap)
server.start()
addr = ('localhost', server.port)
- h = logging.handlers.SMTPHandler(addr, 'me', 'you', 'Log')
+ h = logging.handlers.SMTPHandler(addr, 'me', 'you', 'Log', timeout=5.0)
self.assertEqual(h.toaddrs, ['you'])
self.messages = []
r = logging.makeLogRecord({'msg': 'Hello'})