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.
........
This commit is contained in:
Senthil Kumaran 2009-12-27 09:16:30 +00:00
parent d7729339cc
commit c4151effad

View file

@ -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