RetroSearch Browse

Wed Jul 14 21:28:35 CEST 2010 · http://mail.python.org/pipermail/python-checkins/2010-July/095266.html

Author: senthil.kumaran
Date: Wed Jul 14 21:28:35 2010
New Revision: 82893

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


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

Modified: python/branches/release26-maint/Lib/urllib.py
==============================================================================

--- python/branches/release26-maint/Lib/urllib.py	(original)
+++ python/branches/release26-maint/Lib/urllib.py	Wed Jul 14 21:28:35 2010
@@ -1448,6 +1448,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):


Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from http://mail.python.org/pipermail/python-checkins/2010-July/095266.html below:

[Python-checkins] r82893 - in python/branches/release26-maint: Lib/urllib.py