From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 14 Jul 2010 19:20:43 +0000 (+0000)
Subject: Merged revisions 82890 via svnmerge from
X-Git-Tag: v3.1.3rc1~504
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99f9bd16c9d1358caa11d65d8801df3f729b04d1;p=thirdparty%2FPython%2Fcpython.git

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/request.py b/Lib/urllib/request.py
index cb80a36f8ba0..9fa09cde24ff 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):