cpython-lru_cache-weakref: Lib/ftplib.py annotate

annotate Lib/ftplib.py @ 79675:c0a2294de787 2.7

Issue #16199: Backport 2to3 typo fix from 3.2.

author	Chris Jerdonek <chris.jerdonek@gmail.com>
date	Thu, 11 Oct 2012 16:15:46 -0700
parents	dbf1e1a27427
children	6e07be3dfb6b

rev	line source
11708 4a23cc49e2b0 Actually, the previous batch's comment should have been different; Guido van Rossum <guido@python.org> parents: 11205 diff changeset	1 """An FTP client class and some helper functions.
4a23cc49e2b0 Actually, the previous batch's comment should have been different; Guido van Rossum <guido@python.org> parents: 11205 diff changeset	2
14338 057c7ceb92f0 Added support for RFC 959's REST command (restart), closing SF patch Barry Warsaw <barry@python.org> parents: 14022 diff changeset	3 Based on RFC 959: File Transfer Protocol (FTP), by J. Postel and J. Reynolds
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	5 Example:
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	6
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	7 >>> from ftplib import FTP
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	8 >>> ftp = FTP('ftp.python.org') # connect to host, default port
21583 ec623047073a Update the docstring too. :-) Guido van Rossum <guido@python.org> parents: 21582 diff changeset	9 >>> ftp.login() # default, i.e.: user anonymous, passwd anonymous@
6426 068254fe5617 Return the error code from most commands, rather than swallowing it. Guido van Rossum <guido@python.org> parents: 5753 diff changeset	10 '230 Guest login ok, access restrictions apply.'
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	11 >>> ftp.retrlines('LIST') # list directory contents
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	12 total 9
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	13 drwxr-xr-x 8 root wheel 1024 Jan 3 1994 .
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	14 drwxr-xr-x 8 root wheel 1024 Jan 3 1994 ..
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	15 drwxr-xr-x 2 root wheel 1024 Jan 3 1994 bin
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	16 drwxr-xr-x 2 root wheel 1024 Jan 3 1994 etc
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	17 d-wxrwxr-x 2 ftp wheel 1024 Sep 5 13:43 incoming
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	18 drwxr-xr-x 2 root wheel 1024 Nov 17 1993 lib
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	19 drwxr-xr-x 6 1094 wheel 1024 Sep 13 19:07 pub
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	20 drwxr-xr-x 3 root wheel 1024 Jan 3 1994 usr
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	21 -rw-r--r-- 1 root root 312 Aug 1 1994 welcome.msg
6426 068254fe5617 Return the error code from most commands, rather than swallowing it. Guido van Rossum <guido@python.org> parents: 5753 diff changeset	22 '226 Transfer complete.'
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	23 >>> ftp.quit()
6426 068254fe5617 Return the error code from most commands, rather than swallowing it. Guido van Rossum <guido@python.org> parents: 5753 diff changeset	24 '221 Goodbye.'
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	25 >>>
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	26
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	27 A nice test that reveals some of the network dialogue would be:
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	28 python ftplib.py -d localhost -l -p -l
11708 4a23cc49e2b0 Actually, the previous batch's comment should have been different; Guido van Rossum <guido@python.org> parents: 11205 diff changeset	29 """
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	30
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	31 #
11870 d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11708 diff changeset	32 # Changes and improvements suggested by Steve Majewski.
d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11708 diff changeset	33 # Modified by Jack to work on the mac.
d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11708 diff changeset	34 # Modified by Siebren to support docstrings and PASV.
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	35 # Modified by Phil Schwartz to add storbinary and storlines callbacks.
57278 836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	36 # Modified by Giampaolo Rodola' to add TLS support.
11870 d7eca5b0960a Simple changes by Gerrit Holl - move author acknowledgements out of Guido van Rossum <guido@python.org> parents: 11708 diff changeset	37 #
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	38
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	39 import os
965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	40 import sys
965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	41
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1435 diff changeset	42 # Import SOCKS module if it exists, else standard socket module socket
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1435 diff changeset	43 try:
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	44 import SOCKS; socket = SOCKS; del SOCKS # import SOCKS as socket
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	45 from socket import getfqdn; socket.getfqdn = getfqdn; del getfqdn
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1435 diff changeset	46 except ImportError:
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	47 import socket
47372 e2c5ae30cffe Fixed the semantic of timeout for socket.create_connection and Facundo Batista <facundobatista@gmail.com> parents: 46413 diff changeset	48 from socket import _GLOBAL_DEFAULT_TIMEOUT
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1435 diff changeset	49
16072 bae889f44cd1 more __all__ updates Skip Montanaro <skip@pobox.com> parents: 15881 diff changeset	50 __all__ = ["FTP","Netrc"]
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	51
1291 517d29ebc840 * ftplib.py: added abort() command (sends oob data). Guido van Rossum <guido@python.org> parents: 1286 diff changeset	52 # Magic number from <socket.h>
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	53 MSG_OOB = 0x1 # Process data out of band
1291 517d29ebc840 * ftplib.py: added abort() command (sends oob data). Guido van Rossum <guido@python.org> parents: 1286 diff changeset	54
517d29ebc840 * ftplib.py: added abort() command (sends oob data). Guido van Rossum <guido@python.org> parents: 1286 diff changeset	55
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	56 # The standard FTP server control port
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	57 FTP_PORT = 21
965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	58
965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	59
1089 8d62c9056fe1 Added all_errors, list of all possible exceptions. Guido van Rossum <guido@python.org> parents: 1088 diff changeset	60 # Exception raised when an error or invalid response is received
14022 d44603f2b928 Convert some old-style string exceptions to class exceptions. Fred Drake <fdrake@acm.org> parents: 14014 diff changeset	61 class Error(Exception): pass
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	62 class error_reply(Error): pass # unexpected [123]xx reply
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	63 class error_temp(Error): pass # 4xx errors
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	64 class error_perm(Error): pass # 5xx errors
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	65 class error_proto(Error): pass # response does not begin with [1-5]
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	66
965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	67
1089 8d62c9056fe1 Added all_errors, list of all possible exceptions. Guido van Rossum <guido@python.org> parents: 1088 diff changeset	68 # All exceptions (hopefully) that may be raised here and that aren't
8d62c9056fe1 Added all_errors, list of all possible exceptions. Guido van Rossum <guido@python.org> parents: 1088 diff changeset	69 # (always) programming errors on our side
46413 2a9858255de1 socket.error inherits from IOError, it no longer needs listing in Gregory P. Smith <greg@mad-scientist.com> parents: 44880 diff changeset	70 all_errors = (Error, IOError, EOFError)
1089 8d62c9056fe1 Added all_errors, list of all possible exceptions. Guido van Rossum <guido@python.org> parents: 1088 diff changeset	71
8d62c9056fe1 Added all_errors, list of all possible exceptions. Guido van Rossum <guido@python.org> parents: 1088 diff changeset	72
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	73 # Line terminators (we always output CRLF, but accept any of CRLF, CR, LF)
965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	74 CRLF = '\r\n'
965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	75
965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	76 # The class itself
965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	77 class FTP:
965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	78
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	79 '''An FTP client class.
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	80
41306 03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	81 To create a connection, call the class using these arguments:
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	82 host, user, passwd, acct, timeout
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	83
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	84 The first four arguments are all strings, and have default value ''.
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	85 timeout must be numeric and defaults to None if not passed,
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	86 meaning that no timeout will be set on any ftp socket(s)
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	87 If a timeout is passed, then this is now the default timeout for all ftp
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	88 socket operations for this instance.
41532 4b9fa8092e82 Whitespace normalization. Ugh, we really need to do this more often. Neal Norwitz <nnorwitz@gmail.com> parents: 41326 diff changeset	89
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	90 Then use self.connect() with optional host and port argument.
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	91
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	92 To download a file, use ftp.retrlines('RETR ' + filename),
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	93 or ftp.retrbinary() with slightly different arguments.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	94 To upload a file, use ftp.storlines() or ftp.storbinary(),
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	95 which have an open file as argument (see their definitions
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	96 below for details).
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	97 The download/upload functions first issue appropriate TYPE
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	98 and PORT or PASV commands.
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	99 '''
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	100
16851 e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	101 debugging = 0
e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	102 host = ''
e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	103 port = FTP_PORT
e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	104 sock = None
e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	105 file = None
e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	106 welcome = None
e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	107 passiveserver = 1
e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	108
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	109 # Initialization method (called by class instantiation).
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	110 # Initialize host to localhost, port to standard ftp port
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	111 # Optional arguments are host (for connect()),
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	112 # and user, passwd, acct (for login())
47372 e2c5ae30cffe Fixed the semantic of timeout for socket.create_connection and Facundo Batista <facundobatista@gmail.com> parents: 46413 diff changeset	113 def __init__(self, host='', user='', passwd='', acct='',
e2c5ae30cffe Fixed the semantic of timeout for socket.create_connection and Facundo Batista <facundobatista@gmail.com> parents: 46413 diff changeset	114 timeout=_GLOBAL_DEFAULT_TIMEOUT):
41306 03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	115 self.timeout = timeout
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	116 if host:
16851 e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	117 self.connect(host)
41532 4b9fa8092e82 Whitespace normalization. Ugh, we really need to do this more often. Neal Norwitz <nnorwitz@gmail.com> parents: 41326 diff changeset	118 if user:
41306 03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	119 self.login(user, passwd, acct)
1314 918bee90f73e * calendar.py: minor cleanups Guido van Rossum <guido@python.org> parents: 1297 diff changeset	120
47372 e2c5ae30cffe Fixed the semantic of timeout for socket.create_connection and Facundo Batista <facundobatista@gmail.com> parents: 46413 diff changeset	121 def connect(self, host='', port=0, timeout=-999):
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	122 '''Connect to host. Arguments are:
41306 03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	123 - host: hostname to connect to (string, default previous host)
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	124 - port: port to connect to (integer, default previous port)
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	125 '''
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	126 if host != '':
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	127 self.host = host
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	128 if port > 0:
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	129 self.port = port
47372 e2c5ae30cffe Fixed the semantic of timeout for socket.create_connection and Facundo Batista <facundobatista@gmail.com> parents: 46413 diff changeset	130 if timeout != -999:
41326 ccdc5b3b9b11 Added the posibility to pass the timeout to FTP.connect, not only when Facundo Batista <facundobatista@gmail.com> parents: 41306 diff changeset	131 self.timeout = timeout
41306 03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	132 self.sock = socket.create_connection((self.host, self.port), self.timeout)
03d5db8325f4 Forgot to add the file before the previous commit, here go Facundo Batista <facundobatista@gmail.com> parents: 40732 diff changeset	133 self.af = self.sock.family
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	134 self.file = self.sock.makefile('rb')
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	135 self.welcome = self.getresp()
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	136 return self.welcome
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	137
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	138 def getwelcome(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	139 '''Get the welcome message from the server.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	140 (this is read and squirreled away by connect())'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	141 if self.debugging:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	142 print 'welcome', self.sanitize(self.welcome)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	143 return self.welcome
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	144
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	145 def set_debuglevel(self, level):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	146 '''Set the debugging level.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	147 The required argument level means:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	148 0: no debugging output (default)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	149 1: print commands and responses but not body text etc.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	150 2: also print raw lines read and sent before stripping CR/LF'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	151 self.debugging = level
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	152 debug = set_debuglevel
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	153
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	154 def set_pasv(self, val):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	155 '''Use passive or active mode for data transfers.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	156 With a false argument, use the normal PORT mode,
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	157 With a true argument, use the PASV command.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	158 self.passiveserver = val
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	159
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	160 # Internal: "sanitize" a string for printing
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	161 def sanitize(self, s):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	162 if s[:5] == 'pass ' or s[:5] == 'PASS ':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	163 i = len(s)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	164 while i > 5 and s[i-1] in '\r\n':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	165 i = i-1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	166 s = s[:5] + ''(i-5) + s[i:]
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 23644 diff changeset	167 return repr(s)
2710 b689e6f92f17 don't show print passwords in debug output Guido van Rossum <guido@python.org> parents: 2708 diff changeset	168
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	169 # Internal: send one line to the server, appending CRLF
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	170 def putline(self, line):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	171 line = line + CRLF
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	172 if self.debugging > 1: print 'put', self.sanitize(line)
21962 d3b1f2c0ebcf The Grande 'sendall()' patch, copied from release21-maint. Fixes #516715. Martin v. Löwis <martin@v.loewis.de> parents: 21958 diff changeset	173 self.sock.sendall(line)
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	174
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	175 # Internal: send one command to the server (through putline())
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	176 def putcmd(self, line):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	177 if self.debugging: print 'cmd', self.sanitize(line)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	178 self.putline(line)
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	179
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	180 # Internal: return one line from the server, stripping CRLF.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	181 # Raise EOFError if the connection is closed
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	182 def getline(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	183 line = self.file.readline()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	184 if self.debugging > 1:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	185 print 'get', self.sanitize(line)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	186 if not line: raise EOFError
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	187 if line[-2:] == CRLF: line = line[:-2]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	188 elif line[-1:] in CRLF: line = line[:-1]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	189 return line
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	190
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	191 # Internal: get a response from the server, which may possibly
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	192 # consist of multiple lines. Return a single string with no
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	193 # trailing CRLF. If the response consists of multiple lines,
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	194 # these are separated by '\n' characters in the string
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	195 def getmultiline(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	196 line = self.getline()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	197 if line[3:4] == '-':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	198 code = line[:3]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	199 while 1:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	200 nextline = self.getline()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	201 line = line + ('\n' + nextline)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	202 if nextline[:3] == code and \
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	203 nextline[3:4] != '-':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	204 break
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	205 return line
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	206
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	207 # Internal: get a response from the server.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	208 # Raise various errors if the response indicates an error
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	209 def getresp(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	210 resp = self.getmultiline()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	211 if self.debugging: print 'resp', self.sanitize(resp)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	212 self.lastresp = resp[:3]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	213 c = resp[:1]
35400 9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	214 if c in ('1', '2', '3'):
9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	215 return resp
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	216 if c == '4':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	217 raise error_temp, resp
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	218 if c == '5':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	219 raise error_perm, resp
35400 9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	220 raise error_proto, resp
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	221
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	222 def voidresp(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	223 """Expect a response beginning with '2'."""
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	224 resp = self.getresp()
52866 587a2aed39f2 Merged revisions 71217 via svnmerge from Georg Brandl <georg@python.org> parents: 49318 diff changeset	225 if resp[:1] != '2':
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	226 raise error_reply, resp
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	227 return resp
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	228
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	229 def abort(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	230 '''Abort a file transfer. Uses out-of-band data.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	231 This does not follow the procedure from the RFC to send Telnet
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	232 IP and Synch; that doesn't seem to work with the servers I've
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	233 tried. Instead, just send the ABOR command as OOB data.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	234 line = 'ABOR' + CRLF
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	235 if self.debugging > 1: print 'put urgent', self.sanitize(line)
21962 d3b1f2c0ebcf The Grande 'sendall()' patch, copied from release21-maint. Fixes #516715. Martin v. Löwis <martin@v.loewis.de> parents: 21958 diff changeset	236 self.sock.sendall(line, MSG_OOB)
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	237 resp = self.getmultiline()
60680 a7e69a5f2337 Merged revisions 80172 via svnmerge from Giampaolo Rodolà <g.rodola@gmail.com> parents: 52866 diff changeset	238 if resp[:3] not in ('426', '225', '226'):
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	239 raise error_proto, resp
1291 517d29ebc840 * ftplib.py: added abort() command (sends oob data). Guido van Rossum <guido@python.org> parents: 1286 diff changeset	240
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	241 def sendcmd(self, cmd):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	242 '''Send a command and return the response.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	243 self.putcmd(cmd)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	244 return self.getresp()
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	245
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	246 def voidcmd(self, cmd):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	247 """Send a command and expect a response beginning with '2'."""
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	248 self.putcmd(cmd)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	249 return self.voidresp()
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	250
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	251 def sendport(self, host, port):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	252 '''Send a PORT command with the current host and the given
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	253 port number.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	254 '''
16504 6ffce8be3e0b String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16072 diff changeset	255 hbytes = host.split('.')
49318 0699a712a3db backport r66656 so people using -Qnew aren't affected Benjamin Peterson <benjamin@python.org> parents: 47372 diff changeset	256 pbytes = [repr(port//256), repr(port%256)]
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	257 bytes = hbytes + pbytes
16504 6ffce8be3e0b String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16072 diff changeset	258 cmd = 'PORT ' + ','.join(bytes)
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	259 return self.voidcmd(cmd)
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	260
18825 40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	261 def sendeprt(self, host, port):
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	262 '''Send a EPRT command with the current host and the given port number.'''
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	263 af = 0
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	264 if self.af == socket.AF_INET:
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	265 af = 1
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	266 if self.af == socket.AF_INET6:
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	267 af = 2
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	268 if af == 0:
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	269 raise error_proto, 'unsupported address family'
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 23644 diff changeset	270 fields = ['', repr(af), host, repr(port), '']
23590 a4bb18212b48 Use string methods where possible, and remove import string Neal Norwitz <nnorwitz@gmail.com> parents: 23419 diff changeset	271 cmd = 'EPRT ' + '\|'.join(fields)
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	272 return self.voidcmd(cmd)
18825 40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	273
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	274 def makeport(self):
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	275 '''Create a new socket and send a PORT command for it.'''
18902 edf058b16ddf Initialize msg to avoid unbound locals. Martin v. Löwis <martin@v.loewis.de> parents: 18834 diff changeset	276 msg = "getaddrinfo returns an empty list"
20303 faec69c11640 Only close sockets if they have been created. Reported by Blake Winton. Martin v. Löwis <martin@v.loewis.de> parents: 19341 diff changeset	277 sock = None
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	278 for res in socket.getaddrinfo(None, 0, self.af, socket.SOCK_STREAM, 0, socket.AI_PASSIVE):
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	279 af, socktype, proto, canonname, sa = res
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	280 try:
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	281 sock = socket.socket(af, socktype, proto)
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	282 sock.bind(sa)
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	283 except socket.error, msg:
20303 faec69c11640 Only close sockets if they have been created. Reported by Blake Winton. Martin v. Löwis <martin@v.loewis.de> parents: 19341 diff changeset	284 if sock:
faec69c11640 Only close sockets if they have been created. Reported by Blake Winton. Martin v. Löwis <martin@v.loewis.de> parents: 19341 diff changeset	285 sock.close()
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	286 sock = None
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	287 continue
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	288 break
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	289 if not sock:
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	290 raise socket.error, msg
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	291 sock.listen(1)
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	292 port = sock.getsockname()[1] # Get proper port
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	293 host = self.sock.getsockname()[0] # Get proper host
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	294 if self.af == socket.AF_INET:
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	295 resp = self.sendport(host, port)
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	296 else:
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	297 resp = self.sendeprt(host, port)
60734 7fef8796f777 Merged revisions 80226 via svnmerge from Giampaolo Rodolà <g.rodola@gmail.com> parents: 60680 diff changeset	298 if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
7fef8796f777 Merged revisions 80226 via svnmerge from Giampaolo Rodolà <g.rodola@gmail.com> parents: 60680 diff changeset	299 sock.settimeout(self.timeout)
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	300 return sock
18825 40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	301
40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	302 def makepasv(self):
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	303 if self.af == socket.AF_INET:
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	304 host, port = parse227(self.sendcmd('PASV'))
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	305 else:
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	306 host, port = parse229(self.sendcmd('EPSV'), self.sock.getpeername())
7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	307 return host, port
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	308
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	309 def ntransfercmd(self, cmd, rest=None):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	310 """Initiate a transfer over the data connection.
14338 057c7ceb92f0 Added support for RFC 959's REST command (restart), closing SF patch Barry Warsaw <barry@python.org> parents: 14022 diff changeset	311
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	312 If the transfer is active, send a port command and the
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	313 transfer command, and accept the connection. If the server is
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	314 passive, send a pasv command, connect to it, and start the
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	315 transfer command. Either way, return the socket for the
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	316 connection and the expected size of the transfer. The
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	317 expected size may be None if it could not be determined.
14338 057c7ceb92f0 Added support for RFC 959's REST command (restart), closing SF patch Barry Warsaw <barry@python.org> parents: 14022 diff changeset	318
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	319 Optional `rest' argument can be a string that is sent as the
44880 c3ed6da7a146 docstring and comment updates suggested by Giampaolo Rodola' Gregory P. Smith <greg@mad-scientist.com> parents: 44868 diff changeset	320 argument to a REST command. This is essentially a server
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	321 marker used to tell the server to skip over any data up to the
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	322 given marker.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	323 """
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	324 size = None
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	325 if self.passiveserver:
18825 40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	326 host, port = self.makepasv()
41961 6fd8d524d56b FTP.ntransfercmd method now uses create_connection when passive, Facundo Batista <facundobatista@gmail.com> parents: 41532 diff changeset	327 conn = socket.create_connection((host, port), self.timeout)
71478 dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	328 try:
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	329 if rest is not None:
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	330 self.sendcmd("REST %s" % rest)
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	331 resp = self.sendcmd(cmd)
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	332 # Some servers apparently send a 200 reply to
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	333 # a LIST or STOR command, before the 150 reply
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	334 # (and way before the 226 reply). This seems to
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	335 # be in violation of the protocol (which only allows
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	336 # 1xx or error messages for LIST), so we just discard
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	337 # this response.
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	338 if resp[0] == '2':
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	339 resp = self.getresp()
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	340 if resp[0] != '1':
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	341 raise error_reply, resp
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	342 except:
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	343 conn.close()
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	344 raise
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	345 else:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	346 sock = self.makeport()
71478 dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	347 try:
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	348 if rest is not None:
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	349 self.sendcmd("REST %s" % rest)
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	350 resp = self.sendcmd(cmd)
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	351 # See above.
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	352 if resp[0] == '2':
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	353 resp = self.getresp()
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	354 if resp[0] != '1':
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	355 raise error_reply, resp
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	356 conn, sockaddr = sock.accept()
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	357 if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	358 conn.settimeout(self.timeout)
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	359 finally:
dbf1e1a27427 Issue #10883: Fix socket leaks in urllib.request. Nadeem Vawda <nadeem.vawda@gmail.com> parents: 71000 diff changeset	360 sock.close()
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	361 if resp[:3] == '150':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	362 # this is conditional in case we received a 125
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	363 size = parse150(resp)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	364 return conn, size
4927 040493de848d (ftplib.py): Added parse150() function and FTP.ntransfercmd(). This allows Fred Drake <fdrake@acm.org> parents: 4345 diff changeset	365
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	366 def transfercmd(self, cmd, rest=None):
20461 7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	367 """Like ntransfercmd() but returns only the socket."""
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	368 return self.ntransfercmd(cmd, rest)[0]
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	369
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	370 def login(self, user = '', passwd = '', acct = ''):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	371 '''Login, default anonymous.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	372 if not user: user = 'anonymous'
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	373 if not passwd: passwd = ''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	374 if not acct: acct = ''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	375 if user == 'anonymous' and passwd in ('', '-'):
21958 5ed782bdbb2a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 21583 diff changeset	376 # If there is no anonymous ftp password specified
5ed782bdbb2a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 21583 diff changeset	377 # then we'll just use anonymous@
5ed782bdbb2a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 21583 diff changeset	378 # We don't send any other thing because:
5ed782bdbb2a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 21583 diff changeset	379 # - We want to remain anonymous
5ed782bdbb2a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 21583 diff changeset	380 # - We want to stop SPAM
5ed782bdbb2a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 21583 diff changeset	381 # - We don't want to let ftp sites to discriminate by the user,
5ed782bdbb2a Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 21583 diff changeset	382 # host or country.
21582 a2eab4de5505 SF patch #497420 (Eduardo Pérez): ftplib: ftp anonymous password Guido van Rossum <guido@python.org> parents: 21536 diff changeset	383 passwd = passwd + 'anonymous@'
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	384 resp = self.sendcmd('USER ' + user)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	385 if resp[0] == '3': resp = self.sendcmd('PASS ' + passwd)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	386 if resp[0] == '3': resp = self.sendcmd('ACCT ' + acct)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	387 if resp[0] != '2':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	388 raise error_reply, resp
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	389 return resp
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	390
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	391 def retrbinary(self, cmd, callback, blocksize=8192, rest=None):
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	392 """Retrieve data in binary mode. A new port is created for you.
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	393
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	394 Args:
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	395 cmd: A RETR command.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	396 callback: A single parameter callable to be called on each
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	397 block of data read.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	398 blocksize: The maximum number of bytes to read from the
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	399 socket at one time. [default: 8192]
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	400 rest: Passed to transfercmd(). [default: None]
14338 057c7ceb92f0 Added support for RFC 959's REST command (restart), closing SF patch Barry Warsaw <barry@python.org> parents: 14022 diff changeset	401
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	402 Returns:
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	403 The response code.
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	404 """
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	405 self.voidcmd('TYPE I')
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	406 conn = self.transfercmd(cmd, rest)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	407 while 1:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	408 data = conn.recv(blocksize)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	409 if not data:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	410 break
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	411 callback(data)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	412 conn.close()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	413 return self.voidresp()
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	414
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	415 def retrlines(self, cmd, callback = None):
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	416 """Retrieve data in line mode. A new port is created for you.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	417
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	418 Args:
44880 c3ed6da7a146 docstring and comment updates suggested by Giampaolo Rodola' Gregory P. Smith <greg@mad-scientist.com> parents: 44868 diff changeset	419 cmd: A RETR, LIST, NLST, or MLSD command.
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	420 callback: An optional single parameter callable that is called
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	421 for each line with the trailing CRLF stripped.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	422 [default: print_line()]
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	423
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	424 Returns:
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	425 The response code.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	426 """
23419 4f67e56686e5 Closes SF patch 553277. Per GvR, reverting to original patch -- the way to Raymond Hettinger <python@rcn.com> parents: 23400 diff changeset	427 if callback is None: callback = print_line
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	428 resp = self.sendcmd('TYPE A')
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	429 conn = self.transfercmd(cmd)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	430 fp = conn.makefile('rb')
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	431 while 1:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	432 line = fp.readline()
31515 71a294bd7950 Replace backticks with repr() or "%r" Walter Dörwald <walter@livinglogic.de> parents: 23644 diff changeset	433 if self.debugging > 2: print 'retr', repr(line)
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	434 if not line:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	435 break
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	436 if line[-2:] == CRLF:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	437 line = line[:-2]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	438 elif line[-1:] == '\n':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	439 line = line[:-1]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	440 callback(line)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	441 fp.close()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	442 conn.close()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	443 return self.voidresp()
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	444
57469 a8ab63fd3098 Issue #6845: Add restart support for binary upload in ftplib. The Antoine Pitrou <solipsis@pitrou.net> parents: 57278 diff changeset	445 def storbinary(self, cmd, fp, blocksize=8192, callback=None, rest=None):
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	446 """Store a file in binary mode. A new port is created for you.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	447
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	448 Args:
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	449 cmd: A STOR command.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	450 fp: A file-like object with a read(num_bytes) method.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	451 blocksize: The maximum data size to read from fp and send over
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	452 the connection at once. [default: 8192]
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	453 callback: An optional single parameter callable that is called on
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	454 on each block of data after it is sent. [default: None]
57469 a8ab63fd3098 Issue #6845: Add restart support for binary upload in ftplib. The Antoine Pitrou <solipsis@pitrou.net> parents: 57278 diff changeset	455 rest: Passed to transfercmd(). [default: None]
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	456
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	457 Returns:
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	458 The response code.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	459 """
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	460 self.voidcmd('TYPE I')
57469 a8ab63fd3098 Issue #6845: Add restart support for binary upload in ftplib. The Antoine Pitrou <solipsis@pitrou.net> parents: 57278 diff changeset	461 conn = self.transfercmd(cmd, rest)
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	462 while 1:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	463 buf = fp.read(blocksize)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	464 if not buf: break
21962 d3b1f2c0ebcf The Grande 'sendall()' patch, copied from release21-maint. Fixes #516715. Martin v. Löwis <martin@v.loewis.de> parents: 21958 diff changeset	465 conn.sendall(buf)
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	466 if callback: callback(buf)
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	467 conn.close()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	468 return self.voidresp()
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	469
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	470 def storlines(self, cmd, fp, callback=None):
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	471 """Store a file in line mode. A new port is created for you.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	472
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	473 Args:
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	474 cmd: A STOR command.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	475 fp: A file-like object with a readline() method.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	476 callback: An optional single parameter callable that is called on
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	477 on each line after it is sent. [default: None]
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	478
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	479 Returns:
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	480 The response code.
7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	481 """
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	482 self.voidcmd('TYPE A')
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	483 conn = self.transfercmd(cmd)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	484 while 1:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	485 buf = fp.readline()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	486 if not buf: break
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	487 if buf[-2:] != CRLF:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	488 if buf[-1] in CRLF: buf = buf[:-1]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	489 buf = buf + CRLF
21962 d3b1f2c0ebcf The Grande 'sendall()' patch, copied from release21-maint. Fixes #516715. Martin v. Löwis <martin@v.loewis.de> parents: 21958 diff changeset	490 conn.sendall(buf)
44868 7f2b525f9df4 accepts and closes issue #1221598: adds an optional callback to ftplib.FTP Gregory P. Smith <greg@mad-scientist.com> parents: 41961 diff changeset	491 if callback: callback(buf)
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	492 conn.close()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	493 return self.voidresp()
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	494
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	495 def acct(self, password):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	496 '''Send new account name.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	497 cmd = 'ACCT ' + password
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	498 return self.voidcmd(cmd)
3359 08985431500b add acct() method to send new account name Guido van Rossum <guido@python.org> parents: 3201 diff changeset	499
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	500 def nlst(self, *args):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	501 '''Return a list of files in a given directory (default the current).'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	502 cmd = 'NLST'
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	503 for arg in args:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	504 cmd = cmd + (' ' + arg)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	505 files = []
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	506 self.retrlines(cmd, files.append)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	507 return files
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	508
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	509 def dir(self, *args):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	510 '''List a directory in long form.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	511 By default list current directory to stdout.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	512 Optional last argument is callback function; all
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	513 non-empty arguments before it are concatenated to the
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	514 LIST command. (This should only be used for a pathname.)'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	515 cmd = 'LIST'
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	516 func = None
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	517 if args[-1:] and type(args[-1]) != type(''):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	518 args, func = args[:-1], args[-1]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	519 for arg in args:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	520 if arg:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	521 cmd = cmd + (' ' + arg)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	522 self.retrlines(cmd, func)
1416 d6f6a1cb7d79 * test_.py: new lambda syntax (also affects tests for filter, map, Guido van Rossum <guido@python.org>* parents: 1403 diff changeset	523
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	524 def rename(self, fromname, toname):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	525 '''Rename a file.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	526 resp = self.sendcmd('RNFR ' + fromname)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	527 if resp[0] != '3':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	528 raise error_reply, resp
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	529 return self.voidcmd('RNTO ' + toname)
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	530
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	531 def delete(self, filename):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	532 '''Delete a file.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	533 resp = self.sendcmd('DELE ' + filename)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	534 if resp[:3] in ('250', '200'):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	535 return resp
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	536 else:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	537 raise error_reply, resp
3201 19b58ce794c9 add delete() method to ftp object Guido van Rossum <guido@python.org> parents: 3132 diff changeset	538
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	539 def cwd(self, dirname):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	540 '''Change to a directory.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	541 if dirname == '..':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	542 try:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	543 return self.voidcmd('CDUP')
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	544 except error_perm, msg:
22209 0b08eefb6fc0 Access the exception argument to see whether it starts with '500'. Martin v. Löwis <martin@v.loewis.de> parents: 21962 diff changeset	545 if msg.args[0][:3] != '500':
0b08eefb6fc0 Access the exception argument to see whether it starts with '500'. Martin v. Löwis <martin@v.loewis.de> parents: 21962 diff changeset	546 raise
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	547 elif dirname == '':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	548 dirname = '.' # does nothing, but could return error
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	549 cmd = 'CWD ' + dirname
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	550 return self.voidcmd(cmd)
1286 33f3d7ebfcc1 Added cwd() Guido van Rossum <guido@python.org> parents: 1089 diff changeset	551
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	552 def size(self, filename):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	553 '''Retrieve the size of a file.'''
44880 c3ed6da7a146 docstring and comment updates suggested by Giampaolo Rodola' Gregory P. Smith <greg@mad-scientist.com> parents: 44868 diff changeset	554 # The SIZE command is defined in RFC-3659
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	555 resp = self.sendcmd('SIZE ' + filename)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	556 if resp[:3] == '213':
20461 7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	557 s = resp[3:].strip()
7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	558 try:
7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	559 return int(s)
20500 fddacefeeb36 Oops. Catching OverflowError from int() doesn't help, since it raises Guido van Rossum <guido@python.org> parents: 20461 diff changeset	560 except (OverflowError, ValueError):
20461 7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	561 return long(s)
1297 9234c961ec43 * toaiff.py: import whatsound instead of sndhdr Guido van Rossum <guido@python.org> parents: 1291 diff changeset	562
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	563 def mkd(self, dirname):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	564 '''Make a directory, return its full pathname.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	565 resp = self.sendcmd('MKD ' + dirname)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	566 return parse257(resp)
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	567
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	568 def rmd(self, dirname):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	569 '''Remove a directory.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	570 return self.voidcmd('RMD ' + dirname)
7411 ad891f6a19ee Add rmd() (remove directory command); fix comment in parse257. Guido van Rossum <guido@python.org> parents: 6733 diff changeset	571
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	572 def pwd(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	573 '''Return current working directory.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	574 resp = self.sendcmd('PWD')
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	575 return parse257(resp)
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	576
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	577 def quit(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	578 '''Quit, and close the connection.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	579 resp = self.voidcmd('QUIT')
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	580 self.close()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	581 return resp
1297 9234c961ec43 * toaiff.py: import whatsound instead of sndhdr Guido van Rossum <guido@python.org> parents: 1291 diff changeset	582
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	583 def close(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	584 '''Close the connection without assuming anything about it.'''
71000 a4d418e8010d Fix closes issue1067702 The problem with close multiple ftp transfers were due cases where sockets/file were not closed immediately. Tightned those cases and failure is no longer observed. Senthil Kumaran <senthil@uthcode.com> parents: 68503 diff changeset	585 if self.file is not None:
16851 e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	586 self.file.close()
71000 a4d418e8010d Fix closes issue1067702 The problem with close multiple ftp transfers were due cases where sockets/file were not closed immediately. Tightned those cases and failure is no longer observed. Senthil Kumaran <senthil@uthcode.com> parents: 68503 diff changeset	587 if self.sock is not None:
16851 e5f2ab811ec3 Move some constant initialization from FTP.__init__() and FTP.connect() Fred Drake <fdrake@acm.org> parents: 16609 diff changeset	588 self.sock.close()
71000 a4d418e8010d Fix closes issue1067702 The problem with close multiple ftp transfers were due cases where sockets/file were not closed immediately. Tightned those cases and failure is no longer observed. Senthil Kumaran <senthil@uthcode.com> parents: 68503 diff changeset	589 self.file = self.sock = None
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	590
57278 836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	591 try:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	592 import ssl
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	593 except ImportError:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	594 pass
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	595 else:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	596 class FTP_TLS(FTP):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	597 '''A FTP subclass which adds TLS support to FTP as described
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	598 in RFC-4217.
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	599
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	600 Connect as usual to port 21 implicitly securing the FTP control
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	601 connection before authenticating.
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	602
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	603 Securing the data connection requires user to explicitly ask
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	604 for it by calling prot_p() method.
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	605
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	606 Usage example:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	607 >>> from ftplib import FTP_TLS
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	608 >>> ftps = FTP_TLS('ftp.python.org')
68503 ee5350f1d0c2 #11515: fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 68256 diff changeset	609 >>> ftps.login() # login anonymously previously securing control channel
57278 836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	610 '230 Guest login ok, access restrictions apply.'
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	611 >>> ftps.prot_p() # switch to secure data connection
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	612 '200 Protection level set to P'
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	613 >>> ftps.retrlines('LIST') # list directory content securely
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	614 total 9
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	615 drwxr-xr-x 8 root wheel 1024 Jan 3 1994 .
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	616 drwxr-xr-x 8 root wheel 1024 Jan 3 1994 ..
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	617 drwxr-xr-x 2 root wheel 1024 Jan 3 1994 bin
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	618 drwxr-xr-x 2 root wheel 1024 Jan 3 1994 etc
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	619 d-wxrwxr-x 2 ftp wheel 1024 Sep 5 13:43 incoming
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	620 drwxr-xr-x 2 root wheel 1024 Nov 17 1993 lib
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	621 drwxr-xr-x 6 1094 wheel 1024 Sep 13 19:07 pub
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	622 drwxr-xr-x 3 root wheel 1024 Jan 3 1994 usr
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	623 -rw-r--r-- 1 root root 312 Aug 1 1994 welcome.msg
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	624 '226 Transfer complete.'
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	625 >>> ftps.quit()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	626 '221 Goodbye.'
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	627 >>>
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	628 '''
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	629 ssl_version = ssl.PROTOCOL_TLSv1
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	630
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	631 def __init__(self, host='', user='', passwd='', acct='', keyfile=None,
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	632 certfile=None, timeout=_GLOBAL_DEFAULT_TIMEOUT):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	633 self.keyfile = keyfile
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	634 self.certfile = certfile
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	635 self._prot_p = False
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	636 FTP.__init__(self, host, user, passwd, acct, timeout)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	637
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	638 def login(self, user='', passwd='', acct='', secure=True):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	639 if secure and not isinstance(self.sock, ssl.SSLSocket):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	640 self.auth()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	641 return FTP.login(self, user, passwd, acct)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	642
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	643 def auth(self):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	644 '''Set up secure control connection by using TLS/SSL.'''
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	645 if isinstance(self.sock, ssl.SSLSocket):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	646 raise ValueError("Already using TLS")
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	647 if self.ssl_version == ssl.PROTOCOL_TLSv1:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	648 resp = self.voidcmd('AUTH TLS')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	649 else:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	650 resp = self.voidcmd('AUTH SSL')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	651 self.sock = ssl.wrap_socket(self.sock, self.keyfile, self.certfile,
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	652 ssl_version=self.ssl_version)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	653 self.file = self.sock.makefile(mode='rb')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	654 return resp
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	655
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	656 def prot_p(self):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	657 '''Set up secure data connection.'''
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	658 # PROT defines whether or not the data channel is to be protected.
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	659 # Though RFC-2228 defines four possible protection levels,
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	660 # RFC-4217 only recommends two, Clear and Private.
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	661 # Clear (PROT C) means that no security is to be used on the
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	662 # data-channel, Private (PROT P) means that the data-channel
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	663 # should be protected by TLS.
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	664 # PBSZ command MUST still be issued, but must have a parameter of
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	665 # '0' to indicate that no buffering is taking place and the data
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	666 # connection should not be encapsulated.
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	667 self.voidcmd('PBSZ 0')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	668 resp = self.voidcmd('PROT P')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	669 self._prot_p = True
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	670 return resp
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	671
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	672 def prot_c(self):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	673 '''Set up clear text data connection.'''
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	674 resp = self.voidcmd('PROT C')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	675 self._prot_p = False
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	676 return resp
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	677
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	678 # --- Overridden FTP methods
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	679
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	680 def ntransfercmd(self, cmd, rest=None):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	681 conn, size = FTP.ntransfercmd(self, cmd, rest)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	682 if self._prot_p:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	683 conn = ssl.wrap_socket(conn, self.keyfile, self.certfile,
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	684 ssl_version=self.ssl_version)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	685 return conn, size
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	686
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	687 def retrbinary(self, cmd, callback, blocksize=8192, rest=None):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	688 self.voidcmd('TYPE I')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	689 conn = self.transfercmd(cmd, rest)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	690 try:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	691 while 1:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	692 data = conn.recv(blocksize)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	693 if not data:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	694 break
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	695 callback(data)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	696 # shutdown ssl layer
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	697 if isinstance(conn, ssl.SSLSocket):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	698 conn.unwrap()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	699 finally:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	700 conn.close()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	701 return self.voidresp()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	702
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	703 def retrlines(self, cmd, callback = None):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	704 if callback is None: callback = print_line
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	705 resp = self.sendcmd('TYPE A')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	706 conn = self.transfercmd(cmd)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	707 fp = conn.makefile('rb')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	708 try:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	709 while 1:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	710 line = fp.readline()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	711 if self.debugging > 2: print 'retr', repr(line)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	712 if not line:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	713 break
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	714 if line[-2:] == CRLF:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	715 line = line[:-2]
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	716 elif line[-1:] == '\n':
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	717 line = line[:-1]
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	718 callback(line)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	719 # shutdown ssl layer
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	720 if isinstance(conn, ssl.SSLSocket):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	721 conn.unwrap()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	722 finally:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	723 fp.close()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	724 conn.close()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	725 return self.voidresp()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	726
57469 a8ab63fd3098 Issue #6845: Add restart support for binary upload in ftplib. The Antoine Pitrou <solipsis@pitrou.net> parents: 57278 diff changeset	727 def storbinary(self, cmd, fp, blocksize=8192, callback=None, rest=None):
57278 836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	728 self.voidcmd('TYPE I')
57469 a8ab63fd3098 Issue #6845: Add restart support for binary upload in ftplib. The Antoine Pitrou <solipsis@pitrou.net> parents: 57278 diff changeset	729 conn = self.transfercmd(cmd, rest)
57278 836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	730 try:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	731 while 1:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	732 buf = fp.read(blocksize)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	733 if not buf: break
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	734 conn.sendall(buf)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	735 if callback: callback(buf)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	736 # shutdown ssl layer
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	737 if isinstance(conn, ssl.SSLSocket):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	738 conn.unwrap()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	739 finally:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	740 conn.close()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	741 return self.voidresp()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	742
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	743 def storlines(self, cmd, fp, callback=None):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	744 self.voidcmd('TYPE A')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	745 conn = self.transfercmd(cmd)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	746 try:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	747 while 1:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	748 buf = fp.readline()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	749 if not buf: break
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	750 if buf[-2:] != CRLF:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	751 if buf[-1] in CRLF: buf = buf[:-1]
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	752 buf = buf + CRLF
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	753 conn.sendall(buf)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	754 if callback: callback(buf)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	755 # shutdown ssl layer
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	756 if isinstance(conn, ssl.SSLSocket):
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	757 conn.unwrap()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	758 finally:
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	759 conn.close()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	760 return self.voidresp()
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	761
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	762 __all__.append('FTP_TLS')
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	763 all_errors = (Error, IOError, EOFError, ssl.SSLError)
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	764
836642240464 Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using Antoine Pitrou <solipsis@pitrou.net> parents: 52866 diff changeset	765
6514 6d9cfb53c7ed Use re instead of regex. Also remove bogus return statement from __init__(). Guido van Rossum <guido@python.org> parents: 6426 diff changeset	766 _150_re = None
4927 040493de848d (ftplib.py): Added parse150() function and FTP.ntransfercmd(). This allows Fred Drake <fdrake@acm.org> parents: 4345 diff changeset	767
040493de848d (ftplib.py): Added parse150() function and FTP.ntransfercmd(). This allows Fred Drake <fdrake@acm.org> parents: 4345 diff changeset	768 def parse150(resp):
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	769 '''Parse the '150' response for a RETR request.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	770 Returns the expected transfer size or None; size is not guaranteed to
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	771 be present in the 150 message.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	772 '''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	773 if resp[:3] != '150':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	774 raise error_reply, resp
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	775 global _150_re
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	776 if _150_re is None:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	777 import re
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	778 _150_re = re.compile("150 .* $(\d+) bytes$", re.IGNORECASE)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	779 m = _150_re.match(resp)
20461 7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	780 if not m:
7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	781 return None
7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	782 s = m.group(1)
7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	783 try:
7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	784 return int(s)
20500 fddacefeeb36 Oops. Catching OverflowError from int() doesn't help, since it raises Guido van Rossum <guido@python.org> parents: 20461 diff changeset	785 except (OverflowError, ValueError):
20461 7e71eebab4ea Fix SF bug #459767: ftplib fails with files > 2GB Guido van Rossum <guido@python.org> parents: 20303 diff changeset	786 return long(s)
4927 040493de848d (ftplib.py): Added parse150() function and FTP.ntransfercmd(). This allows Fred Drake <fdrake@acm.org> parents: 4345 diff changeset	787
040493de848d (ftplib.py): Added parse150() function and FTP.ntransfercmd(). This allows Fred Drake <fdrake@acm.org> parents: 4345 diff changeset	788
19341 d46682bda82f Change the 227 response parser to use a more liberal regular Guido van Rossum <guido@python.org> parents: 18902 diff changeset	789 _227_re = None
d46682bda82f Change the 227 response parser to use a more liberal regular Guido van Rossum <guido@python.org> parents: 18902 diff changeset	790
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	791 def parse227(resp):
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	792 '''Parse the '227' response for a PASV request.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	793 Raises error_proto if it does not contain '(h1,h2,h3,h4,p1,p2)'
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	794 Return ('host.addr.as.numbers', port#) tuple.'''
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	795
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	796 if resp[:3] != '227':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	797 raise error_reply, resp
19341 d46682bda82f Change the 227 response parser to use a more liberal regular Guido van Rossum <guido@python.org> parents: 18902 diff changeset	798 global _227_re
d46682bda82f Change the 227 response parser to use a more liberal regular Guido van Rossum <guido@python.org> parents: 18902 diff changeset	799 if _227_re is None:
d46682bda82f Change the 227 response parser to use a more liberal regular Guido van Rossum <guido@python.org> parents: 18902 diff changeset	800 import re
d46682bda82f Change the 227 response parser to use a more liberal regular Guido van Rossum <guido@python.org> parents: 18902 diff changeset	801 _227_re = re.compile(r'(\d+),(\d+),(\d+),(\d+),(\d+),(\d+)')
d46682bda82f Change the 227 response parser to use a more liberal regular Guido van Rossum <guido@python.org> parents: 18902 diff changeset	802 m = _227_re.search(resp)
d46682bda82f Change the 227 response parser to use a more liberal regular Guido van Rossum <guido@python.org> parents: 18902 diff changeset	803 if not m:
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	804 raise error_proto, resp
19341 d46682bda82f Change the 227 response parser to use a more liberal regular Guido van Rossum <guido@python.org> parents: 18902 diff changeset	805 numbers = m.groups()
16504 6ffce8be3e0b String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16072 diff changeset	806 host = '.'.join(numbers[:4])
6ffce8be3e0b String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16072 diff changeset	807 port = (int(numbers[4]) << 8) + int(numbers[5])
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	808 return host, port
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	809
63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	810
18825 40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	811 def parse229(resp, peer):
40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	812 '''Parse the '229' response for a EPSV request.
40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	813 Raises error_proto if it does not contain '(\|\|\|port\|)'
40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	814 Return ('host.addr.as.numbers', port#) tuple.'''
40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	815
35400 9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	816 if resp[:3] != '229':
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	817 raise error_reply, resp
23590 a4bb18212b48 Use string methods where possible, and remove import string Neal Norwitz <nnorwitz@gmail.com> parents: 23419 diff changeset	818 left = resp.find('(')
18825 40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	819 if left < 0: raise error_proto, resp
23590 a4bb18212b48 Use string methods where possible, and remove import string Neal Norwitz <nnorwitz@gmail.com> parents: 23419 diff changeset	820 right = resp.find(')', left + 1)
18825 40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	821 if right < 0:
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	822 raise error_proto, resp # should contain '(\|\|\|port\|)'
35400 9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	823 if resp[left + 1] != resp[right - 1]:
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	824 raise error_proto, resp
23644 3ebd376aa4cb Fix a regression from the 1.68->1.69 checkin: Walter Dörwald <walter@livinglogic.de> parents: 23620 diff changeset	825 parts = resp[left + 1:right].split(resp[left+1])
35400 9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	826 if len(parts) != 5:
18834 7e52bf52ae33 Untabify IPv6 changes. Martin v. Löwis <martin@v.loewis.de> parents: 18825 diff changeset	827 raise error_proto, resp
18825 40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	828 host = peer[0]
23590 a4bb18212b48 Use string methods where possible, and remove import string Neal Norwitz <nnorwitz@gmail.com> parents: 23419 diff changeset	829 port = int(parts[3])
18825 40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	830 return host, port
40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	831
40900620293e Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. Martin v. Löwis <martin@v.loewis.de> parents: 17347 diff changeset	832
1087 b9e4f7321e28 Added much functionality, changed some names (errors, login). Guido van Rossum <guido@python.org> parents: 1085 diff changeset	833 def parse257(resp):
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	834 '''Parse the '257' response for a MKD or PWD request.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	835 This is a response to a MKD or PWD request: a directory name.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	836 Returns the directoryname in the 257 reply.'''
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	837
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	838 if resp[:3] != '257':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	839 raise error_reply, resp
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	840 if resp[3:5] != ' "':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	841 return '' # Not compliant to RFC 959, but UNIX ftpd does this
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	842 dirname = ''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	843 i = 5
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	844 n = len(resp)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	845 while i < n:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	846 c = resp[i]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	847 i = i+1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	848 if c == '"':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	849 if i >= n or resp[i] != '"':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	850 break
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	851 i = i+1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	852 dirname = dirname + c
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	853 return dirname
1085 965aa3b53a9d Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	854
6426 068254fe5617 Return the error code from most commands, rather than swallowing it. Guido van Rossum <guido@python.org> parents: 5753 diff changeset	855
1416 d6f6a1cb7d79 * test_.py: new lambda syntax (also affects tests for filter, map, Guido van Rossum <guido@python.org>* parents: 1403 diff changeset	856 def print_line(line):
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	857 '''Default retrlines callback to print a line.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	858 print line
1416 d6f6a1cb7d79 * test_.py: new lambda syntax (also affects tests for filter, map, Guido van Rossum <guido@python.org>* parents: 1403 diff changeset	859
6426 068254fe5617 Return the error code from most commands, rather than swallowing it. Guido van Rossum <guido@python.org> parents: 5753 diff changeset	860
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	861 def ftpcp(source, sourcename, target, targetname = '', type = 'I'):
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	862 '''Copy file from one FTP-instance to another.'''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	863 if not targetname: targetname = sourcename
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	864 type = 'TYPE ' + type
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	865 source.voidcmd(type)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	866 target.voidcmd(type)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	867 sourcehost, sourceport = parse227(source.sendcmd('PASV'))
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	868 target.sendport(sourcehost, sourceport)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	869 # RFC 959: the user must "listen" [...] BEFORE sending the
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	870 # transfer request.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	871 # So: STOR before RETR, because here the target is a "user".
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	872 treply = target.sendcmd('STOR ' + targetname)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	873 if treply[:3] not in ('125', '150'): raise error_proto # RFC 959
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	874 sreply = source.sendcmd('RETR ' + sourcename)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	875 if sreply[:3] not in ('125', '150'): raise error_proto # RFC 959
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	876 source.voidresp()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	877 target.voidresp()
5190 a79ecd5af7e5 Added Fred Drake's netrc parser class. Guido van Rossum <guido@python.org> parents: 4927 diff changeset	878
5753 64bc782a42ec Wrapped up the ~/.netrc support. This is basically just the changes Guido & Fred Drake <fdrake@acm.org> parents: 5190 diff changeset	879
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	880 class Netrc:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	881 """Class to parse & provide access to 'netrc' format files.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	882
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	883 See the netrc(4) man page for information on the file format.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	884
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	885 WARNING: This class is obsolete -- use module netrc instead.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	886
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	887 """
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	888 __defuser = None
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	889 __defpasswd = None
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	890 __defacct = None
3649 63cdfbb4a2bb Docstringified and PASV support by Siebren (including new ftpcp() function). Guido van Rossum <guido@python.org> parents: 3398 diff changeset	891
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	892 def __init__(self, filename=None):
23612 3caee2958387 Replace boolean test with is None Raymond Hettinger <python@rcn.com> parents: 23590 diff changeset	893 if filename is None:
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23612 diff changeset	894 if "HOME" in os.environ:
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	895 filename = os.path.join(os.environ["HOME"],
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	896 ".netrc")
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	897 else:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	898 raise IOError, \
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	899 "specify file to load or set $HOME"
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	900 self.__hosts = {}
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	901 self.__macros = {}
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	902 fp = open(filename, "r")
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	903 in_macro = 0
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	904 while 1:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	905 line = fp.readline()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	906 if not line: break
16504 6ffce8be3e0b String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16072 diff changeset	907 if in_macro and line.strip():
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	908 macro_lines.append(line)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	909 continue
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	910 elif in_macro:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	911 self.__macros[macro_name] = tuple(macro_lines)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	912 in_macro = 0
16504 6ffce8be3e0b String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16072 diff changeset	913 words = line.split()
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	914 host = user = passwd = acct = None
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	915 default = 0
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	916 i = 0
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	917 while i < len(words):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	918 w1 = words[i]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	919 if i+1 < len(words):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	920 w2 = words[i + 1]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	921 else:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	922 w2 = None
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	923 if w1 == 'default':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	924 default = 1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	925 elif w1 == 'machine' and w2:
16504 6ffce8be3e0b String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16072 diff changeset	926 host = w2.lower()
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	927 i = i + 1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	928 elif w1 == 'login' and w2:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	929 user = w2
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	930 i = i + 1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	931 elif w1 == 'password' and w2:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	932 passwd = w2
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	933 i = i + 1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	934 elif w1 == 'account' and w2:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	935 acct = w2
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	936 i = i + 1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	937 elif w1 == 'macdef' and w2:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	938 macro_name = w2
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	939 macro_lines = []
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	940 in_macro = 1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	941 break
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	942 i = i + 1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	943 if default:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	944 self.__defuser = user or self.__defuser
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	945 self.__defpasswd = passwd or self.__defpasswd
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	946 self.__defacct = acct or self.__defacct
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	947 if host:
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23612 diff changeset	948 if host in self.__hosts:
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	949 ouser, opasswd, oacct = \
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	950 self.__hosts[host]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	951 user = user or ouser
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	952 passwd = passwd or opasswd
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	953 acct = acct or oacct
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	954 self.__hosts[host] = user, passwd, acct
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	955 fp.close()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	956
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	957 def get_hosts(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	958 """Return a list of hosts mentioned in the .netrc file."""
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	959 return self.__hosts.keys()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	960
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	961 def get_account(self, host):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	962 """Returns login information for the named host.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	963
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	964 The return value is a triple containing userid,
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	965 password, and the accounting field.
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	966
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	967 """
16504 6ffce8be3e0b String method conversion. Eric S. Raymond <esr@thyrsus.com> parents: 16072 diff changeset	968 host = host.lower()
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	969 user = passwd = acct = None
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 23612 diff changeset	970 if host in self.__hosts:
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	971 user, passwd, acct = self.__hosts[host]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	972 user = user or self.__defuser
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	973 passwd = passwd or self.__defpasswd
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	974 acct = acct or self.__defacct
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	975 return user, passwd, acct
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	976
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	977 def get_macros(self):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	978 """Return a list of all defined macro names."""
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	979 return self.__macros.keys()
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	980
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	981 def get_macro(self, macro):
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	982 """Return a sequence of lines which define a named macro."""
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	983 return self.__macros[macro]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	984
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	985
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	986
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	987 def test():
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	988 '''Test program.
35400 9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	989 Usage: ftp [-d] [-r[file]] host [-l[dir]] [-d[dir]] [-p] [file] ...
9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	990
9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	991 -d dir
9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	992 -l list
9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	993 -p password
9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	994 '''
9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	995
9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	996 if len(sys.argv) < 2:
9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	997 print test.__doc__
9e05ea3b1bf3 Backport 1.74 Raymond Hettinger <python@rcn.com> parents: 31515 diff changeset	998 sys.exit(0)
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	999
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1000 debugging = 0
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1001 rcfile = None
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1002 while sys.argv[1] == '-d':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1003 debugging = debugging+1
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1004 del sys.argv[1]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1005 if sys.argv[1][:2] == '-r':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1006 # get name of alternate ~/.netrc file:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1007 rcfile = sys.argv[1][2:]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1008 del sys.argv[1]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1009 host = sys.argv[1]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1010 ftp = FTP(host)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1011 ftp.set_debuglevel(debugging)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1012 userid = passwd = acct = ''
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1013 try:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1014 netrc = Netrc(rcfile)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1015 except IOError:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1016 if rcfile is not None:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1017 sys.stderr.write("Could not open account file"
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1018 " -- using anonymous login.")
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1019 else:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1020 try:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1021 userid, passwd, acct = netrc.get_account(host)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1022 except KeyError:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1023 # no account for host
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1024 sys.stderr.write(
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1025 "No account -- using anonymous login.")
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1026 ftp.login(userid, passwd, acct)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1027 for file in sys.argv[2:]:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1028 if file[:2] == '-l':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1029 ftp.dir(file[2:])
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1030 elif file[:2] == '-d':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1031 cmd = 'CWD'
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1032 if file[2:]: cmd = cmd + ' ' + file[2:]
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1033 resp = ftp.sendcmd(cmd)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1034 elif file == '-p':
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1035 ftp.set_pasv(not ftp.passiveserver)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1036 else:
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1037 ftp.retrbinary('RETR ' + file, \
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1038 sys.stdout.write, 1024)
f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1039 ftp.quit()
2902 13581b417837 new sendport() interface; add test() program call Guido van Rossum <guido@python.org> parents: 2758 diff changeset	1040
13581b417837 new sendport() interface; add test() program call Guido van Rossum <guido@python.org> parents: 2758 diff changeset	1041
13581b417837 new sendport() interface; add test() program call Guido van Rossum <guido@python.org> parents: 2758 diff changeset	1042 if __name__ == '__main__':
15867 f5a3d98a35bc Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15543 diff changeset	1043 test()

Mercurial > cpython-lru_cache-weakref

annotate Lib/ftplib.py @ 79675:c0a2294de787 2.7