From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 26 Mar 2012 16:17:39 +0000 (+0100)
Subject: Updated handler documentation.
X-Git-Tag: v3.3.0a2~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38a12af36a2ffb67796eadfbe1d83497a859b775;p=python

Updated handler documentation.
---

38a12af36a2ffb67796eadfbe1d83497a859b775
diff --cc Doc/library/logging.handlers.rst
index 51e476b060,ef65cfa559..537b8c7b56
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@@ -704,7 -614,7 +704,7 @@@ The :class:`SMTPHandler` class, locate
  supports sending logging messages to an email address via SMTP.
  
  
--.. class:: SMTPHandler(mailhost, fromaddr, toaddrs, subject, credentials=None, secure=None)
++.. class:: SMTPHandler(mailhost, fromaddr, toaddrs, subject, credentials=None, secure=None, timeout=1.0)
  
     Returns a new instance of the :class:`SMTPHandler` class. The instance is
     initialized with the from and to addresses and subject line of the email. The
@@@ -720,6 -630,6 +720,12 @@@
     and certificate file. (This tuple is passed to the
     :meth:`smtplib.SMTP.starttls` method.)
  
++   A timeout can be specified for communication with the SMTP server using the
++   *timeout* argument.
++
++   .. versionadded:: 3.3
++      The *timeout* argument was added.
++
     .. method:: emit(record)
  
        Formats the record and sends it to the specified addressees.