diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-07-14 19:20:43 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-07-14 19:20:43 (GMT) |
| commit | 99f9bd16c9d1358caa11d65d8801df3f729b04d1 (patch) | |
| tree | 4d22d66c03f2a0971d7b7ce699b260587f3fea30 /Lib/urllib | |
| parent | 376e14acfe05e6fd792abd15b959fa78432e72e6 (diff) | |
| download | cpython-99f9bd16c9d1358caa11d65d8801df3f729b04d1.zip cpython-99f9bd16c9d1358caa11d65d8801df3f729b04d1.tar.gz cpython-99f9bd16c9d1358caa11d65d8801df3f729b04d1.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/urllib')
| -rw-r--r-- | Lib/urllib/request.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index cb80a36..9fa09cd 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2283,6 +2283,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): |