merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-06 18:18:16 +02:00
commit e448ccaa6f
1 changed files with 13 additions and 13 deletions

View File

@ -23,16 +23,17 @@ as mirroring other ftp servers. It is also used by the module
Here's a sample session using the :mod:`ftplib` module:: Here's a sample session using the :mod:`ftplib` module::
>>> from ftplib import FTP >>> from ftplib import FTP
>>> ftp = FTP('ftp.cwi.nl') # connect to host, default port >>> ftp = FTP('ftp.debian.org') # connect to host, default port
>>> ftp.login() # user anonymous, passwd anonymous@ >>> ftp.login() # user anonymous, passwd anonymous@
'230 Login successful.'
>>> ftp.cwd('debian') # change into "debian" directory
>>> ftp.retrlines('LIST') # list directory contents >>> ftp.retrlines('LIST') # list directory contents
total 24418 -rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18 README
drwxrwsr-x 5 ftp-usr pdmaint 1536 Mar 20 09:48 . ...
dr-xr-srwt 105 ftp-usr pdmaint 1536 Mar 21 14:32 .. drwxr-sr-x 5 1176 1176 4096 Dec 19 2000 pool
-rw-r--r-- 1 ftp-usr pdmaint 5305 Mar 20 09:48 INDEX drwxr-sr-x 4 1176 1176 4096 Nov 17 2008 project
. drwxr-xr-x 3 1176 1176 4096 Oct 10 2012 tools
. '226 Directory send OK.'
.
>>> ftp.retrbinary('RETR README', open('README', 'wb').write) >>> ftp.retrbinary('RETR README', open('README', 'wb').write)
'226 Transfer complete.' '226 Transfer complete.'
>>> ftp.quit() >>> ftp.quit()
@ -423,7 +424,8 @@ FTP_TLS Objects
.. method:: FTP_TLS.auth() .. method:: FTP_TLS.auth()
Set up secure control connection by using TLS or SSL, depending on what specified in :meth:`ssl_version` attribute. Set up secure control connection by using TLS or SSL, depending on what
specified in :meth:`ssl_version` attribute.
.. method:: FTP_TLS.ccc() .. method:: FTP_TLS.ccc()
@ -440,5 +442,3 @@ FTP_TLS Objects
.. method:: FTP_TLS.prot_c() .. method:: FTP_TLS.prot_c()
Set up clear text data connection. Set up clear text data connection.