[Python-checkins] cpython (3.2): Fix issue #16646: ftplib.FTP.makeport() might lose socket error details.
giampaolo.rodola
python-checkins at python.org
Mon Dec 17 14:24:56 CET 2012
http://hg.python.org/cpython/rev/b7419f88c628
changeset: 80905:b7419f88c628
branch: 3.2
parent: 80902:248359588f89
user: Giampaolo Rodola' <g.rodola at gmail.com>
date: Mon Dec 17 14:20:27 2012 +0100
summary:
Fix issue #16646: ftplib.FTP.makeport() might lose socket error details. (patch by Serhiy Storchaka)
files:
Lib/ftplib.py | 10 +++++++---
Misc/NEWS | 3 +++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -284,20 +284,24 @@
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 as msg:
+ except socket.error as err:
if sock:
sock.close()
sock = None
continue
break
- if not sock:
+ if sock is None:
+ if err is not None:
+ raise err
+ else:
+ raise socket.error("getaddrinfo returns an empty list")
raise socket.error(msg)
sock.listen(1)
port = sock.getsockname()[1] # Get proper port
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -179,6 +179,9 @@
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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list