[Python-checkins] r82891 - in python/branches/release31-maint: Lib/urllib/request.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Wed Jul 14 21:20:43 2010
New Revision: 82891

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/urllib/request.py

Modified: python/branches/release31-maint/Lib/urllib/request.py
==============================================================================
--- python/branches/release31-maint/Lib/urllib/request.py	(original)
+++ python/branches/release31-maint/Lib/urllib/request.py	Wed Jul 14 21:20:43 2010
@@ -2283,6 +2283,7 @@
                         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):