diff options
| author | Guido van Rossum <guido@python.org> | 2002-04-02 14:38:16 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2002-04-02 14:38:16 (GMT) |
| commit | 64e5aa93919bb0ffd95a11a5da7bac64faaf9faf (patch) | |
| tree | ce944e3dc9310ef91e8b3ff443570706ed81ffa5 /Lib | |
| parent | 45afd54c8f1a027e4a290b8e1f5530868d6cec75 (diff) | |
| download | cpython-64e5aa93919bb0ffd95a11a5da7bac64faaf9faf.zip cpython-64e5aa93919bb0ffd95a11a5da7bac64faaf9faf.tar.gz cpython-64e5aa93919bb0ffd95a11a5da7bac64faaf9faf.tar.bz2 | |
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).
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/urllib.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ elif os.name == 'nt': 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: |