From: Gregory P. Smith Date: Mon, 14 Dec 2015 06:10:28 +0000 (-0800) Subject: Issue #11072: change the incorrect "deprecation" of ftplib dir() and nlst() X-Git-Tag: v3.6.0a1~911^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1b3134d28d76a00926cff8b38bdf922292b101a;p=thirdparty%2FPython%2Fcpython.git 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. --- diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst index f06e678ecd1e..67a603b505fe 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)