From cae14d2714f363445d8ac0d631dc102b0ef292a9 Mon Sep 17 00:00:00 2001
From: Skip Montanaro <skip@pobox.com>
Date: Tue, 14 Sep 2004 17:55:21 +0000
Subject: [PATCH] missed the obvious test case and corresponding fix

---
 Lib/httplib.py           | 3 ++-
 Lib/test/test_httplib.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 2f117d8d5d5..b7276af357f 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -525,7 +525,8 @@ class HTTPConnection:
     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:
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index b49f71d2e33..046f4f871a4 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -119,7 +119,7 @@ def _test():
             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: