diff options
| -rw-r--r-- | Lib/ftplib.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index c896433..53b5f44 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 @@ -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. |