Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

when splithost() returned no useable host, to avoid calling
splituser() on None.
This commit is contained in:
Guido van Rossum 1998-04-27 15:19:17 +00:00
parent d0ddb66c84
commit 0eae8fba81
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/urllib.py
View File

@ -214,9 +214,11 @@ def retrieve(self, url, filename=None):
# 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 @@ def open_http(self, url, data=None):
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,