From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 11 Aug 2010 18:18:22 +0000 (+0000)
Subject: Fix Issue9446 - urllib2 tests fail when offline
X-Git-Tag: v2.7.1rc1~418
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7cc0fe44e0f9caa9c193818d96f1ece9c66abd98;p=thirdparty%2FPython%2Fcpython.git

Fix Issue9446 - urllib2 tests fail when offline
---

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index d0e81a8084f7..7af882cb38df 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -1259,6 +1259,12 @@ def parse_http_list(s):
 
     return [part.strip() for part in res]
 
+def _safe_gethostbyname(host):
+    try:
+        return socket.gethostbyname(host)
+    except socket.gaierror:
+        return None
+
 class FileHandler(BaseHandler):
     # Use local file or FTP depending on form of URL
     def file_open(self, req):
@@ -1300,7 +1306,7 @@ class FileHandler(BaseHandler):
             if host:
                 host, port = splitport(host)
             if not host or \
-                (not port and socket.gethostbyname(host) in self.get_names()):
+                (not port and _safe_gethostbyname(host) in self.get_names()):
                 if host:
                     origurl = 'file://' + host + filename
                 else: