From: Senthil Kumaran <senthil@uthcode.com>
Date: Sat, 1 Jun 2013 18:12:17 +0000 (-0700)
Subject: Fix thishost helper funtion in urllib. Returns the ipaddress of localhost when
X-Git-Tag: v3.4.0a1~584^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcdadfe39afd9b7cddf1e20efa37babdad61ff77;p=thirdparty%2FPython%2Fcpython.git

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/request.py b/Lib/urllib/request.py
index 1279322496f0..30e43e6f9f91 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -2229,7 +2229,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