From c2a8169aa30c8f7dee3b874661f73e0b9c3f0919 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola' Date: Mon, 17 Dec 2012 14:30:48 +0100 Subject: [PATCH] Fix issue #16646: ftplib.FTP.makeport() might lose socket error details. (patch by Serhiy Storchaka) --- Lib/ftplib.py | 11 +++++++---- Misc/NEWS | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Lib/ftplib.py b/Lib/ftplib.py index c8964330bf..53b5f44c52 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -273,21 +273,24 @@ class FTP: def makeport(self): '''Create a new socket and send a PORT command for it.''' - msg = "getaddrinfo returns an empty list" + err = None sock = None for res in socket.getaddrinfo(None, 0, self.af, socket.SOCK_STREAM, 0, socket.AI_PASSIVE): af, socktype, proto, canonname, sa = res try: sock = socket.socket(af, socktype, proto) sock.bind(sa) - except socket.error, msg: + except socket.error, err: if sock: sock.close() sock = None continue break - if not sock: - raise socket.error, msg + if sock is None: + if err is not None: + raise err + else: + raise socket.error("getaddrinfo returns an empty list") sock.listen(1) port = sock.getsockname()[1] # Get proper port host = self.sock.getsockname()[0] # Get proper host diff --git a/Misc/NEWS b/Misc/NEWS index 4e6e661074..8f5460aaaa 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -160,6 +160,9 @@ Core and Builtins Library ------- +- Issue #16646: ftplib.FTP.makeport() might lose socket error details. + (patch by Serhiy Storchaka) + - Issue #16626: Fix infinite recursion in glob.glob() on Windows when the pattern contains a wildcard in the drive or UNC path. Patch by Serhiy Storchaka. -- 2.49.0