[Python-checkins] cpython (3.2): Issue13104 - Fix urllib.request.thishost() utility function.

[senthil.kumaran]

http://hg.python.org/cpython/rev/805a0a1e3c2b
changeset:   72695:805a0a1e3c2b
branch:      3.2
parent:      72692:befa7b926aad
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Thu Oct 06 00:32:02 2011 +0800
summary:
  Issue13104 - Fix urllib.request.thishost() utility function.

files:
  Lib/test/test_urllib.py |  4 ++++
  Lib/urllib/request.py   |  2 +-
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
--- 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
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -2116,7 +2116,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

-- 
Repository URL: http://hg.python.org/cpython