Merged revisions 82892 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r82892 | senthil.kumaran | 2010-07-15 00:55:26 +0530 (Thu, 15 Jul 2010) | 9 lines

  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 da4f56ed8980ee4422be3fdd00923927aed35d20..d5d576011e1306d2834e6c08a7c3437e7e42bcd5 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1448,6 +1448,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):