From: Guido van Rossum <guido@python.org>
Date: Mon, 27 Apr 1998 15:19:17 +0000 (+0000)
Subject: Feeble attempt at making urlopen more robust -- don't call splituser()
X-Git-Tag: v1.5.2a1~814
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0eae8fba8172f947a4c66d9e961a74767271e05d;p=python

Feeble attempt at making urlopen more robust -- don't call splituser()
when splithost() returned no useable host, to avoid calling
splituser() on None.
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 8a47316c9b..1f110c0dd4 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -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,