From: Vinay Sajip Date: Mon, 1 Aug 2011 10:31:52 +0000 (+0100) Subject: Closes #12667: Added documentation for SMTPHandler secure argument. X-Git-Tag: v3.2.2rc1~40 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=952595696a43f1d8a6c79da314bad4ed93bc9209;p=python Closes #12667: Added documentation for SMTPHandler secure argument. --- diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst index 378c07198f..a18cf92329 100644 --- a/Doc/library/logging.handlers.rst +++ b/Doc/library/logging.handlers.rst @@ -614,7 +614,7 @@ The :class:`SMTPHandler` class, located in the :mod:`logging.handlers` module, supports sending logging messages to an email address via SMTP. -.. class:: SMTPHandler(mailhost, fromaddr, toaddrs, subject, credentials=None) +.. class:: SMTPHandler(mailhost, fromaddr, toaddrs, subject, credentials=None, secure=None) 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 @@ -623,6 +623,12 @@ supports sending logging messages to an email address via SMTP. the standard SMTP port is used. If your SMTP server requires authentication, you can specify a (username, password) tuple for the *credentials* argument. + To specify the use of a secure protocol (TLS), pass in a tuple to the + *secure* argument. This will only be used when authentication credentials are + supplied. The tuple should be either an empty tuple, or a single-value tuple + with the name of a keyfile, or a 2-value tuple with the names of the keyfile + and certificate file. (This tuple is passed to the + :meth:`smtplib.SMTP.starttls` method.) .. method:: emit(record)