ada/cpython
0
0
Fork 0
mirror of https://github.com/AdaCore/cpython.git synced 2026-02-12 12:57:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

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
parent edf33c0145 dcdadfe39a
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