cpython: 3f7d5c235d82 (original) (raw)

Mercurial > cpython

changeset 81072:3f7d5c235d82

MERGE: Closes #16789: :meth:`quit` links to constants instead of own module [#16789]

Jesus Cea jcea@jcea.es
date	Wed, 26 Dec 2012 16:48:26 +0100
parents	2d1cfbaef9a2(current diff)b6a9f8fd9443(diff)
children	6a56eaa5e5fb
files	Doc/library/poplib.rst
diffstat	3 files changed, 7 insertions(+), 6 deletions(-)[+] [-] Doc/library/ftplib.rst 8 Doc/library/poplib.rst 2 Doc/library/smtplib.rst 3

line wrap: on

line diff

--- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -406,10 +406,10 @@ followed by lines for the text versi .. method:: FTP.close() Close the connection unilaterally. This should not be applied to an already

closed connection such as after a successful call to :meth:quit. After this
call the :class:FTP instance should not be used any more (after a call to
:meth:close or :meth:quit you cannot reopen the connection by issuing
another :meth:login method).

closed connection such as after a successful call to :meth:~FTP.quit.
After this call the :class:FTP instance should not be used any more (after
a call to :meth:close or :meth:~FTP.quit you cannot reopen the
connection by issuing another :meth:login method).

FTP_TLS Objects

--- a/Doc/library/poplib.rst +++ b/Doc/library/poplib.rst @@ -116,7 +116,7 @@ An :class:POP3 instance has the follow .. method:: POP3.pass_(password) Send password, response includes message count and mailbox size. Note: the

mailbox on the server is locked until :meth:quit is called.

mailbox on the server is locked until :meth:~poplib.quit is called.

.. method:: POP3.apop(user, secret)

--- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -37,7 +37,8 @@ Protocol) and :rfc:1869 (SMTP Service behavior will be used. For normal use, you should only require the initialization/connect,

:meth:sendmail, and :meth:quit methods. An example is included below.

:meth:sendmail, and :meth:~smtplib.quit methods.
An example is included below. The :class:SMTP class supports the :keyword:with statement. When used like this, the SMTP QUIT command is issued automatically when the