summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2015-12-14 06:10:58 (GMT)
committerGregory P. Smith <greg@krypto.org>2015-12-14 06:10:58 (GMT)
commit60889d12381409edefcc98d33388ea6ae9a60478 (patch)
tree52c4f3d28eead78a2be80e442d2f1113513d105f
parentfcbdf9906ba1ee0fcb53ff1a8afaaa933a92a56f (diff)
parentf1b3134d28d76a00926cff8b38bdf922292b101a (diff)
downloadcpython-60889d12381409edefcc98d33388ea6ae9a60478.zip
cpython-60889d12381409edefcc98d33388ea6ae9a60478.tar.gz
cpython-60889d12381409edefcc98d33388ea6ae9a60478.tar.bz2
Issue #11072: change the incorrect "deprecation" of ftplib dir() and nlst()
APIs into a note that mlsd() is a nicer API if the server supports it. They aren't deprecated, they are all different server commands. Not all servers support all commands.
-rw-r--r--Doc/library/ftplib.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index f06e678..67a603b 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -314,7 +314,7 @@ followed by ``lines`` for the text version or ``binary`` for the binary version.
.. method:: FTP.mlsd(path="", facts=[])
- List a directory in a standardized format by using MLSD command
+ List a directory in a standardized format by using ``MLSD`` command
(:rfc:`3659`). If *path* is omitted the current directory is assumed.
*facts* is a list of strings representing the type of information desired
(e.g. ``["type", "size", "perm"]``). Return a generator object yielding a
@@ -333,7 +333,7 @@ followed by ``lines`` for the text version or ``binary`` for the binary version.
directory). Multiple arguments can be used to pass non-standard options to
the ``NLST`` command.
- .. deprecated:: 3.3 use :meth:`mlsd` instead.
+ .. note:: If your server supports the command, :meth:`mlsd` offers a better API.
.. method:: FTP.dir(argument[, ...])
@@ -345,7 +345,7 @@ followed by ``lines`` for the text version or ``binary`` for the binary version.
as a *callback* function as for :meth:`retrlines`; the default prints to
``sys.stdout``. This method returns ``None``.
- .. deprecated:: 3.3 use :meth:`mlsd` instead.
+ .. note:: If your server supports the command, :meth:`mlsd` offers a better API.
.. method:: FTP.rename(fromname, toname)