mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 84604 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84604 | antoine.pitrou | 2010-09-07 23:43:31 +0200 (mar., 07 sept. 2010) | 3 lines

  Also catch some gaierrors
........
This commit is contained in:
Antoine Pitrou 2010-09-07 21:44:17 +00:00
parent 4d7979be72
commit dae0c63fc8
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/support.py
View file

@ -624,16 +624,25 @@ def transient_internet(resource_name, *, timeout=30.0, errnos=()):
('ENETUNREACH', 101), ('ENETUNREACH', 101),
('ETIMEDOUT', 110), ('ETIMEDOUT', 110),
] ]
default_gai_errnos = [
('EAI_NONAME', -2),
('EAI_NODATA', -5),
]
denied = ResourceDenied("Resource '%s' is not available" % resource_name) denied = ResourceDenied("Resource '%s' is not available" % resource_name)
captured_errnos = errnos captured_errnos = errnos
gai_errnos = []
if not captured_errnos: if not captured_errnos:
captured_errnos = [getattr(errno, name, num) captured_errnos = [getattr(errno, name, num)
for (name, num) in default_errnos] for (name, num) in default_errnos]
gai_errnos = [getattr(socket, name, num)
for (name, num) in default_gai_errnos]
def filter_error(err): def filter_error(err):
n = getattr(err, 'errno', None)
if (isinstance(err, socket.timeout) or if (isinstance(err, socket.timeout) or
getattr(err, 'errno', None) in captured_errnos): (isinstance(err, socket.gaierror) and n in gai_errnos) or
n in captured_errnos):
if not verbose: if not verbose:
sys.stderr.write(denied.args[0] + "\n") sys.stderr.write(denied.args[0] + "\n")
raise denied from err raise denied from err