mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge from 3.3

Browse source 
Fix thishost helper funtion in urllib. Returns the ipaddress of localhost when
hostname is resolvable by socket.gethostname for local machine. This all fixes
certain freebsd builtbot failures.
This commit is contained in:
Senthil Kumaran 2013-06-01 11:12:52 -07:00
commit 88249b80d7
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/urllib/request.py
View file

@ -2259,7 +2259,10 @@ def thishost():
"""Return the IP addresses of the current host."""
global _thishost
if _thishost is None:
_thishost = tuple(socket.gethostbyname_ex(socket.gethostname())[2])
try:
_thishost = tuple(socket.gethostbyname_ex(socket.gethostname())[2])
except socket.gaierror:
_thishost = tuple(socket.gethostbyname_ex('localhost')[2])
return _thishost
_ftperrors = None