Fix for a bug in the fix for SF bug 503031. This time the OP verified
that it works.
Bugfix candidate (this and the previous checkin, obviously).
diff --git a/Lib/urllib.py b/Lib/urllib.py
index 123642a..d028d7a 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1279,8 +1279,8 @@
for p in proxyServer.split(';'):
protocol, address = p.split('=', 1)
# See if address has a type:// prefix
- type, address = splittype(address)
- if not type:
+ import re
+ if not re.match('^([^/:]+)://', address):
address = '%s://%s' % (protocol, address)
proxies[protocol] = address
else: