Merged revisions 82897 via svnmerge from

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

................
  r82897 | senthil.kumaran | 2010-07-15 01:52:17 +0530 (Thu, 15 Jul 2010) | 9 lines

  Merged revisions 82895 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r82895 | senthil.kumaran | 2010-07-15 01:40:52 +0530 (Thu, 15 Jul 2010) | 3 lines

    Fix a mistake, https proxy shoud be https://
  ........
................

diff --git a/Lib/urllib.py b/Lib/urllib.py
index d5d576011e1306d2834e6c08a7c3437e7e42bcd5..042b4d82f8bb287d0beab3ee523900b56ea63b90 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1448,7 +1448,7 @@ elif os.name == 'nt':
                         proxies['http'] = proxyServer
                     else:
                         proxies['http'] = 'http://%s' % proxyServer
-                        proxies['https'] = 'http://%s' % proxyServer
+                        proxies['https'] = 'https://%s' % proxyServer
                         proxies['ftp'] = 'ftp://%s' % proxyServer
             internetSettings.Close()
         except (WindowsError, ValueError, TypeError):