diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-07-14 19:28:35 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-07-14 19:28:35 (GMT) |
| commit | 7a4e8379437017ada5d0e8e74c752cc6c4b5030f (patch) | |
| tree | 7b26aeef7bd9839156f4d450c458029e0aed85fe | |
| parent | d76ec0fe4c2abd68a58a9388e7153ed954beb48a (diff) | |
| download | cpython-7a4e8379437017ada5d0e8e74c752cc6c4b5030f.zip cpython-7a4e8379437017ada5d0e8e74c752cc6c4b5030f.tar.gz cpython-7a4e8379437017ada5d0e8e74c752cc6c4b5030f.tar.bz2 | |
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.
........
................
| -rw-r--r-- | Lib/urllib.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py index da4f56e..d5d5760 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -1448,6 +1448,7 @@ elif os.name == 'nt': 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): |