From 99f9bd16c9d1358caa11d65d8801df3f729b04d1 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Wed, 14 Jul 2010 19:20:43 +0000 Subject: 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. ........ --- Lib/urllib/request.py | 1 + 1 file changed, 1 insertion(+) 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): -- cgit v0.12