summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-07-14 20:13:28 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-07-14 20:13:28 (GMT)
commit1ea57a6c5f3a78dd28349dbb58639385cc53788a (patch)
tree74a27f851da5b78bdc54ef65259e586efe28eb30 /Lib/urllib
parent99f9bd16c9d1358caa11d65d8801df3f729b04d1 (diff)
downloadcpython-1ea57a6c5f3a78dd28349dbb58639385cc53788a.zip
cpython-1ea57a6c5f3a78dd28349dbb58639385cc53788a.tar.gz
cpython-1ea57a6c5f3a78dd28349dbb58639385cc53788a.tar.bz2
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:// ........
Diffstat (limited to 'Lib/urllib')
-rw-r--r--Lib/urllib/request.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 9fa09cd..14ea0aa 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -2283,7 +2283,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):