From: Guido van Rossum <guido@python.org>
Date: Tue, 5 May 1998 13:58:13 +0000 (+0000)
Subject: Patches to make the proxy code work again.  (Why does that always break
X-Git-Tag: v1.5.2a1~759
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0c0da98d85a343ec0578ce8ce690fb952118a0b;p=python

Patches to make the proxy code work again.  (Why does that always break
as soon as I change things even just a little bit? :-)  Even works
when accessing a password-protected page through the proxy.  Prompted
by complaints from, and correct operation verified by, Nigel O'Brian.
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 1f110c0dd4..cabfeeeb6d 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -223,6 +223,7 @@ class URLopener:
 		else:
 			host, selector = url
 			urltype, rest = splittype(selector)
+			url = rest
 			user_passwd = None
 			if string.lower(urltype) != 'http':
 				realhost = None
@@ -459,8 +460,8 @@ class FancyURLopener(URLopener):
 		user, passwd = self.get_user_passwd(host, realm, i)
 		if not (user or passwd): return None
 		host = user + ':' + passwd + '@' + host
-		newurl = '//' + host + selector
-		return self.open_http(newurl)
+		newurl = 'http://' + host + selector
+		return self.open(newurl)
 
 	def get_user_passwd(self, host, realm, clear_cache = 0):
 		key = realm + '@' + string.lower(host)