Kaydet (Commit) 99f9bd16 authored tarafından Senthil Kumaran's avatar Senthil Kumaran

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.
........
üst 376e14ac
...@@ -2283,6 +2283,7 @@ elif os.name == 'nt': ...@@ -2283,6 +2283,7 @@ elif os.name == 'nt':
proxies['http'] = proxyServer proxies['http'] = proxyServer
else: else:
proxies['http'] = 'http://%s' % proxyServer proxies['http'] = 'http://%s' % proxyServer
proxies['https'] = 'http://%s' % proxyServer
proxies['ftp'] = 'ftp://%s' % proxyServer proxies['ftp'] = 'ftp://%s' % proxyServer
internetSettings.Close() internetSettings.Close()
except (WindowsError, ValueError, TypeError): except (WindowsError, ValueError, TypeError):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment