107c107,115
<             return int(port, 10)
---
>             try:
>                 return int(port, 10)
>             except ValueError, e:
>                 if self.scheme == "http":
>                     return 80
>                 elif self.scheme == "https":
>                     return 443
>                 else:
>                     return 80
109c117,122
<             return None
---
>             if self.scheme == "http":
>                 return 80
>             elif self.scheme == "https":
>                 return 443
>             else:
>                 return 80
158c171,179
<     return url[start:delim], url[delim:]   # return (domain, rest)
---
>     dom, rest = url[start:delim], url[delim:]   # return (domain, rest)
>     t = dom.split(":")
>     if len(t) > 2:
>         raise ValueError("Invalid URL")
>     elif len(t) == 2:
>         if t[1].isdigit() and int(t[1]) >= 1 and int(t[1]) <= 65535:
>             return dom, rest
>         else:
>             raise ValueError("Invalid Port")
398a420
>