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.

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 32b4919f07fb2b10e26784341a221de39db1db58..09a054b623cbcb5b4e02ffeda16cb18757ca43a0 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -819,7 +819,10 @@ def thishost():
     """Return the IP address of the current host."""
     global _thishost
     if _thishost is None:
-        _thishost = socket.gethostbyname(socket.gethostname())
+        try:
+            _thishost = socket.gethostbyname(socket.gethostname())
+        except socket.gaierror:
+            _thishost = socket.gethostbyname('localhost')
     return _thishost
 
 _ftperrors = None