diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-07 21:40:25 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-07 21:40:25 +0000 |
| commit | c818ed4d61b12a702b2af813cd0ac4839faf497f (patch) | |
| tree | ba4a83dcee870d847a7f0f8c2a91200c4b26304a /Lib/socket.py | |
| parent | d47a68716e7dfdf79a19129a9a8369b41a173f27 (diff) | |
| download | cpython-git-c818ed4d61b12a702b2af813cd0ac4839faf497f.tar.gz | |
Merged revisions 84597-84599 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84597 | antoine.pitrou | 2010-09-07 22:42:19 +0200 (mar., 07 sept. 2010) | 5 lines
Issue #8574: better implementation of test.support.transient_internet().
Original patch by Victor.
........
r84598 | antoine.pitrou | 2010-09-07 23:05:49 +0200 (mar., 07 sept. 2010) | 6 lines
Issue #9792: In case of connection failure, socket.create_connection()
would swallow the exception and raise a new one, making it impossible
to fetch the original errno, or to filter timeout errors. Now the
original error is re-raised.
........
r84599 | antoine.pitrou | 2010-09-07 23:09:09 +0200 (mar., 07 sept. 2010) | 4 lines
Improve transient_internet() again to detect more network errors,
and use it in test_robotparser. Fixes #8574.
........
Diffstat (limited to 'Lib/socket.py')
| -rw-r--r-- | Lib/socket.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Lib/socket.py b/Lib/socket.py index 9ed2de9132..bd364e70db 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -548,8 +548,8 @@ def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT, An host of '' or port 0 tells the OS to use the default. """ - msg = "getaddrinfo returns an empty list" host, port = address + err = None for res in getaddrinfo(host, port, 0, SOCK_STREAM): af, socktype, proto, canonname, sa = res sock = None @@ -562,8 +562,12 @@ def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT, sock.connect(sa) return sock - except error, msg: + except error as _: + err = _ if sock is not None: sock.close() - raise error, msg + if err is not None: + raise err + else: + raise error("getaddrinfo returns an empty list") |