diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-07-14 19:25:26 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-07-14 19:25:26 (GMT) |
| commit | 836a2bba2f067df3b3f8c452b0a1a033295eddc6 (patch) | |
| tree | 673fef33a5c69e275c1dda3a1c972f7101e2f845 /Lib | |
| parent | 21239048a6a8bcc0ea28608a808062ce18f0e55c (diff) | |
| download | cpython-836a2bba2f067df3b3f8c452b0a1a033295eddc6.zip cpython-836a2bba2f067df3b3f8c452b0a1a033295eddc6.tar.gz cpython-836a2bba2f067df3b3f8c452b0a1a033295eddc6.tar.bz2 | |
Merged revisions 82890 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82890 | senthil.kumaran | 2010-07-15 00:45:23 +0530 (Thu, 15 Jul 2010) | 3 lines
Fix: Issue6853 - Get HTTPS system proxy in Windows.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/urllib.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py index 707e2f0..b35e92a 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -1453,6 +1453,7 @@ elif os.name == 'nt': proxies['http'] = proxyServer else: proxies['http'] = 'http://%s' % proxyServer + proxies['https'] = 'http://%s' % proxyServer proxies['ftp'] = 'ftp://%s' % proxyServer internetSettings.Close() except (WindowsError, ValueError, TypeError): |