merge from 3.2. Issue13104 - Fix urllib.request.thishost() utility function.
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 671708a..77637a6 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -1058,6 +1058,10 @@
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 4a571e8..671ab68 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -2125,7 +2125,7 @@
"""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