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 1f110c0..cabfeee 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -223,6 +223,7 @@
else:
host, selector = url
urltype, rest = splittype(selector)
+ url = rest
user_passwd = None
if string.lower(urltype) != 'http':
realhost = None
@@ -459,8 +460,8 @@
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)