summaryrefslogtreecommitdiffstats
path: root/Lib/urllib.py
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-07-14 20:22:17 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-07-14 20:22:17 (GMT)
commit0fdd385e2ce7b197e4eb6be4d2d03a115a5268ae (patch)
treeae1fd696b1ff63e9fec8f729b85b3c6e605aaf27 /Lib/urllib.py
parent836a2bba2f067df3b3f8c452b0a1a033295eddc6 (diff)
downloadcpython-0fdd385e2ce7b197e4eb6be4d2d03a115a5268ae.zip
cpython-0fdd385e2ce7b197e4eb6be4d2d03a115a5268ae.tar.gz
cpython-0fdd385e2ce7b197e4eb6be4d2d03a115a5268ae.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.py')
-rw-r--r--Lib/urllib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py
index b35e92a..fb98421 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1453,7 +1453,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):