diff options
| author | Facundo Batista <facundobatista@gmail.com> | 2007-03-30 13:00:35 (GMT) |
|---|---|---|
| committer | Facundo Batista <facundobatista@gmail.com> | 2007-03-30 13:00:35 (GMT) |
| commit | 93c33680a031a5b2b11aaebe0f6dcc1b803f7be1 (patch) | |
| tree | 561f3827481530171cbe5590e5b715af5b61bf11 /Lib/ftplib.py | |
| parent | b6a5c9d605588e962f1cd242d2a52065f4c141db (diff) | |
| download | cpython-93c33680a031a5b2b11aaebe0f6dcc1b803f7be1.zip cpython-93c33680a031a5b2b11aaebe0f6dcc1b803f7be1.tar.gz cpython-93c33680a031a5b2b11aaebe0f6dcc1b803f7be1.tar.bz2 | |
Added the posibility to pass the timeout to FTP.connect, not only when
instantiating the class. Docs and tests are updated.
Diffstat (limited to 'Lib/ftplib.py')
| -rw-r--r-- | Lib/ftplib.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 22aff51..012671b 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -115,7 +115,7 @@ class FTP: if user: self.login(user, passwd, acct) - def connect(self, host='', port=0): + def connect(self, host='', port=0, timeout=None): '''Connect to host. Arguments are: - host: hostname to connect to (string, default previous host) - port: port to connect to (integer, default previous port) @@ -124,6 +124,8 @@ class FTP: self.host = host if port > 0: self.port = port + if timeout is not None: + self.timeout = timeout self.sock = socket.create_connection((self.host, self.port), self.timeout) self.af = self.sock.family self.file = self.sock.makefile('rb') |