diff options
author | Martin Panter <vadmium+py@gmail.com> | 2015-11-21 22:48:54 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2015-11-21 22:48:54 (GMT) |
commit | 23244e5787209254143753f8bbaecde7d29ea9da (patch) | |
tree | 0f623d62a8c85d66209dbdad922a2b95dadac4f8 /Doc | |
parent | 4a93cf794c99a0c2a629cd986be550dcd029bfb4 (diff) | |
parent | 828123ce4e4d9f5a98ad4912817e7e86e1deae0c (diff) | |
download | cpython-23244e5787209254143753f8bbaecde7d29ea9da.zip cpython-23244e5787209254143753f8bbaecde7d29ea9da.tar.gz cpython-23244e5787209254143753f8bbaecde7d29ea9da.tar.bz2 |
Issue #25689: Merge ftplib and nntplib docs from 3.4 into 3.5
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/ftplib.rst | 3 | ||||
-rw-r--r-- | Doc/library/nntplib.rst | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst index 3d1f783..f06e678 100644 --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -52,8 +52,7 @@ The module defines the following items: will be used). *source_address* is a 2-tuple ``(host, port)`` for the socket to bind to as its source address before connecting. - :class:`FTP` class supports the :keyword:`with` statement. Here is a sample - on how using it: + The :class:`FTP` class supports the :keyword:`with` statement, e.g.: >>> from ftplib import FTP >>> with FTP("ftp1.at.proftpd.org") as ftp: diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst index 4797965..9fb1b45 100644 --- a/Doc/library/nntplib.rst +++ b/Doc/library/nntplib.rst @@ -69,9 +69,9 @@ The module itself defines the following classes: connecting to an NNTP server on the local machine and intend to call reader-specific commands, such as ``group``. If you get unexpected :exc:`NNTPPermanentError`\ s, you might need to set *readermode*. - :class:`NNTP` class supports the :keyword:`with` statement to + The :class:`NNTP` class supports the :keyword:`with` statement to unconditionally consume :exc:`OSError` exceptions and to close the NNTP - connection when done. Here is a sample on how using it: + connection when done, e.g.: >>> from nntplib import NNTP >>> with NNTP('news.gmane.org') as n: |