commit cae14d2714f363445d8ac0d631dc102b0ef292a9
author Skip Montanaro <skip@pobox.com> Tue Sep 14 17:55:21 2004 +0000
committer Skip Montanaro <skip@pobox.com> Tue Sep 14 17:55:21 2004 +0000
tree 01e8a066d6fe02f635df0d79cb08302635630aab
parent 1fd00a1b7185a6bfb575e3ca0303e5fdc9d24498

missed the obvious test case and corresponding fix

Lib/httplib.py

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 2f117d8..b7276af 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -525,7 +525,8 @@
     def _set_hostport(self, host, port):
         if port is None:
             i = host.rfind(':')
-            if i >= 0:
+            j = host.rfind(']')         # ipv6 addresses have [...]
+            if i > j:
                 try:
                     port = int(host[i+1:])
                 except ValueError:

Lib/test/test_httplib.py

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index b49f71d..046f4f8 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -119,7 +119,7 @@
             print "Expect InvalidURL"
 
     for hp in ("[fe80::207:e9ff:fe9b]:8000", "www.python.org:80",
-               "www.python.org"):
+               "www.python.org", "[fe80::207:e9ff:fe9b]"):
         try:
             h = httplib.HTTP(hp)
         except httplib.InvalidURL: