merge

Lib/logging/handlers.py

@@ -872,7 +872,7 @@ class SMTPHandler(logging.Handler):
     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.
 

Lib/test/test_logging.py

@@ -930,7 +930,7 @@ class SMTPHandlerTest(BaseTest):
                                 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'})