add InvalidURL exception - raised if port is given but empty or non-numeric

1 files changed, 7 insertions, 1 deletions

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 4bad4638a4..ce819ebfbf 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -347,7 +347,10 @@ class HTTPConnection:
         if port is None:
             i = host.find(':')
             if i >= 0:
-                port = int(host[i+1:])
+                try:
+                    port = int(host[i+1:])
+                except ValueError:
+                    raise InvalidURL, "nonnumeric port: '%s'"%host[i+1:]
                 host = host[:i]
             else:
                 port = self.default_port
@@ -808,6 +811,9 @@ class HTTPException(Exception):
 class NotConnected(HTTPException):
     pass
 
+class InvalidURL(HTTPException):
+    pass
+
 class UnknownProtocol(HTTPException):
     def __init__(self, version):
         self.version = version