diff -r c78770ae8442 Doc/library/smtplib.rst --- a/Doc/library/smtplib.rst Thu Oct 13 21:10:42 2016 +0200 +++ b/Doc/library/smtplib.rst Thu Oct 13 22:43:28 2016 +0200 @@ -373,6 +373,11 @@ .. versionadded:: 3.5 +.. method:: SMTP.data(msg) + + Send message to server with SMTP ``DATA`` command; see docstring for details. + + .. method:: SMTP.starttls(keyfile=None, certfile=None, context=None) Put the SMTP connection in TLS (Transport Layer Security) mode. All SMTP @@ -520,16 +525,53 @@ Support for internationalized addresses (``SMTPUTF8``). +.. method:: SMTP.rcpt(recip, options=[]) + + Specify recipient for this mail. Executes and returns reply for + SMTP ``RCPT`` command. ESMTP options (such as ``8bitmime``) may be passed + as *options*. + + This method may raise the following exceptions: + + :exc:`SMTPNotSupportedError` + ``SMTPUTF8`` was given in the *options* but is not supported by the + server. + + +.. method:: SMTP.rset() + + Send SMTP ``RSET``. Equivalent to ``.docmd('rset')``, see + :meth:`SMTP.docmd`. + + +.. method:: SMTP.mail(sender, options=[]) + + Open mail session. Executes and returns reply for SMTP ``MAIL`` command. + List of ESMTP options (such as ``DSN`` commands) may be passed as *options*. + + This method may raise the following exceptions: + + :exc:`SMTPNotSupportedError` + ``SMTPUTF8`` was given in the *options* but is not supported by the + server. + + +.. method:: SMTP.noop() + + Send SMTP ``NOOP``. Equivalent to ``.docmd('noop')``, see + :meth:`SMTP.docmd`. + + .. method:: SMTP.quit() Terminate the SMTP session and close the connection. Return the result of the SMTP ``QUIT`` command. -Low-level methods corresponding to the standard SMTP/ESMTP commands ``HELP``, -``RSET``, ``NOOP``, ``MAIL``, ``RCPT``, and ``DATA`` are also supported. -Normally these do not need to be called directly, so they are not documented -here. For details, consult the module code. +.. method:: SMTP.help() + + This is a convenience method for getting output for `help` command, + returning only message part of the reply. .. _smtp-example: