mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-03 23:41:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 77060 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77060 | senthil.kumaran | 2009-12-27 15:43:39 +0530 (Sun, 27 Dec 2009) | 10 lines

  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 10:15:45 +00:00
parent eb65775e22
commit 88a495d223
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/urllib/request.py
View file

@ -1190,8 +1190,9 @@ class FileHandler(BaseHandler):
def get_names(self): def get_names(self):
if FileHandler.names is None: if FileHandler.names is None:
try: try:
FileHandler.names = (socket.gethostbyname('localhost'), FileHandler.names = tuple(
socket.gethostbyname(socket.gethostname())) socket.gethostbyname_ex('localhost')[2] +
socket.gethostbyname_ex(socket.gethostname())[2])
except socket.gaierror: except socket.gaierror:
FileHandler.names = (socket.gethostbyname('localhost'),) FileHandler.names = (socket.gethostbyname('localhost'),)
return FileHandler.names return FileHandler.names
@ -1690,7 +1691,7 @@ class URLopener:
return addinfourl(open(localname, 'rb'), headers, urlfile) return addinfourl(open(localname, 'rb'), headers, urlfile)
host, port = splitport(host) host, port = splitport(host)
if (not port if (not port
and socket.gethostbyname(host) in (localhost(), thishost())): and socket.gethostbyname(host) in (localhost() + thishost())):
urlfile = file urlfile = file
if file[:1] == '/': if file[:1] == '/':
urlfile = 'file://' + file urlfile = 'file://' + file
@ -2000,10 +2001,10 @@ def localhost():
_thishost = None _thishost = None
def thishost(): def thishost():
"""Return the IP address of the current host.""" """Return the IP addresses of the current host."""
global _thishost global _thishost
if _thishost is None: if _thishost is None:
_thishost = socket.gethostbyname(socket.gethostname()) _thishost = tuple(socket.gethostbyname_ex(socket.gethostname()[2]))
return _thishost return _thishost
_ftperrors = None _ftperrors = None