From c4151effad5ec16f54730da2d7c1312b97ccada5 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sun, 27 Dec 2009 09:16:30 +0000 Subject: [PATCH] Merged revisions 77058 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77058 | senthil.kumaran | 2009-12-27 14:41:09 +0530 (Sun, 27 Dec 2009) | 4 lines Fix for issue5625 - test_urllib2 fails - urlopen error file not on local host. This is on hosts with multiple ip addresses. ........ --- Lib/urllib2.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/urllib2.py b/Lib/urllib2.py index a976533918..b7f2cf46e1 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -1261,8 +1261,9 @@ class FileHandler(BaseHandler): def get_names(self): if FileHandler.names is None: try: - FileHandler.names = (socket.gethostbyname('localhost'), - socket.gethostbyname(socket.gethostname())) + FileHandler.names = tuple( + socket.gethostbyname_ex('localhost')[2] + + socket.gethostbyname_ex(socket.gethostname())[2]) except socket.gaierror: FileHandler.names = (socket.gethostbyname('localhost'),) return FileHandler.names -- 2.50.0