From 0eae8fba8172f947a4c66d9e961a74767271e05d Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 27 Apr 1998 15:19:17 +0000 Subject: [PATCH] Feeble attempt at making urlopen more robust -- don't call splituser() when splithost() returned no useable host, to avoid calling splituser() on None. --- Lib/urllib.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/urllib.py b/Lib/urllib.py index 8a47316c9bd..1f110c0dd48 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -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,