mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge

Browse source
This commit is contained in:
Brett Cannon 2012-04-22 13:30:07 -04:00
commit 8c5e920ae3
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/logging/handlers.py
View file

@ -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.

2
Lib/test/test_logging.py
View file

@ -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'})