[Python-checkins] cpython (merge default -> default): merge

[brett.cannon]

http://hg.python.org/cpython/rev/0a79a2add552
changeset:   76477:0a79a2add552
parent:      76476:2a7f445f71eb
parent:      76475:bdbcb8f48ddd
user:        Brett Cannon <brett at python.org>
date:        Sun Apr 22 13:30:07 2012 -0400
summary:
  merge

files:
  Lib/logging/handlers.py  |  2 +-
  Lib/test/test_logging.py |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
--- 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
--- 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'})

-- 
Repository URL: http://hg.python.org/cpython