summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2011-10-06 00:32:02 +0800
committerSenthil Kumaran <senthil@uthcode.com>2011-10-06 00:32:02 +0800
commit1b7da519b09d8885272d323af982d36675419075 (patch)
tree04b642a7c9dcd000d51a7e906f3b5de0aeafd620
parentad87fa671939609f9ff7c0d489f09a8c86586fbd (diff)
downloadcpython-git-1b7da519b09d8885272d323af982d36675419075.tar.gz
Issue13104 - Fix urllib.request.thishost() utility function.
-rw-r--r--Lib/test/test_urllib.py4
-rw-r--r--Lib/urllib/request.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index c6dae1710e..8055dc20fe 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -1058,6 +1058,10 @@ class Utility_Tests(unittest.TestCase):
self.assertEqual(('user', 'a\vb'),urllib.parse.splitpasswd('user:a\vb'))
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):
"""Testcase to test the open method of URLopener class."""
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 773025a09b..d3b5c29cbb 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -2116,7 +2116,7 @@ def thishost():
"""Return the IP addresses of the current host."""
global _thishost
if _thishost is None:
- _thishost = tuple(socket.gethostbyname_ex(socket.gethostname()[2]))
+ _thishost = tuple(socket.gethostbyname_ex(socket.gethostname())[2])
return _thishost
_ftperrors = None