diff options
| author | Facundo Batista <facundobatista@gmail.com> | 2007-06-06 15:13:37 +0000 |
|---|---|---|
| committer | Facundo Batista <facundobatista@gmail.com> | 2007-06-06 15:13:37 +0000 |
| commit | 308a600b3bd0857cdb4a33e1f79b422d4896c0fa (patch) | |
| tree | bbceea12b95c7e811bc87bd052d9c9ef3b29c816 /Lib/ftplib.py | |
| parent | fc7107a27d35c88f67955f3f33d961126b0f01bc (diff) | |
| download | cpython-308a600b3bd0857cdb4a33e1f79b422d4896c0fa.tar.gz | |
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
Diffstat (limited to 'Lib/ftplib.py')
| -rw-r--r-- | Lib/ftplib.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index f9b6396de9..3e9189e7c1 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -319,9 +319,7 @@ class FTP: size = None if self.passiveserver: host, port = self.makepasv() - af, socktype, proto, canon, sa = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)[0] - conn = socket.socket(af, socktype, proto) - conn.connect(sa) + conn = socket.create_connection((host, port), self.timeout) if rest is not None: self.sendcmd("REST %s" % rest) resp = self.sendcmd(cmd) |