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.
........

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 707e2f0c65f07345efb0680006574de6c135a4c5..b35e92afb0e61b537255a950e6ca88d83c17ceec 100644 (file)
--- 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):