mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

merge from 3.2. Issue13104 - Fix urllib.request.thishost() utility function.

Browse source
This commit is contained in:
Senthil Kumaran 2011-10-06 00:32:52 +08:00
commit 55a190fbbd
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_urllib.py
View file

@ -1058,6 +1058,10 @@ class Utility_Tests(unittest.TestCase):
self.assertEqual(('user', 'a\vb'),urllib.parse.splitpasswd('user:a\vb')) self.assertEqual(('user', 'a\vb'),urllib.parse.splitpasswd('user:a\vb'))
self.assertEqual(('user', 'a:b'),urllib.parse.splitpasswd('user:a:b')) self.assertEqual(('user', 'a:b'),urllib.parse.splitpasswd('user:a:b'))
def test_thishost(self):
"""Test the urllib.request.thishost utility function returns a tuple"""
self.assertIsInstance(urllib.request.thishost(), tuple)
class URLopener_Tests(unittest.TestCase): class URLopener_Tests(unittest.TestCase):
"""Testcase to test the open method of URLopener class.""" """Testcase to test the open method of URLopener class."""

2
Lib/urllib/request.py
View file

@ -2125,7 +2125,7 @@ def thishost():
"""Return the IP addresses 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 = tuple(socket.gethostbyname_ex(socket.gethostname()[2])) _thishost = tuple(socket.gethostbyname_ex(socket.gethostname())[2])
return _thishost return _thishost
_ftperrors = None _ftperrors = None