Commit 0eae8fba authored by Guido van Rossum's avatar Guido van Rossum

Feeble attempt at making urlopen more robust -- don't call splituser()

when splithost() returned no useable host, to avoid calling
splituser() on None.
parent d0ddb66c
......@@ -214,9 +214,11 @@ class URLopener:
# Use HTTP protocol
def open_http(self, url, data=None):
import httplib
user_passwd = None
if type(url) is type(""):
host, selector = splithost(url)
user_passwd, host = splituser(host)
if host:
user_passwd, host = splituser(host)
realhost = host
else:
host, selector = url
......@@ -226,7 +228,9 @@ class URLopener:
realhost = None
else:
realhost, rest = splithost(rest)
user_passwd, realhost = splituser(realhost)
if realhost:
user_passwd, realhost = \
splituser(realhost)
if user_passwd:
selector = "%s://%s%s" % (urltype,
realhost,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment