Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 82150 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82150 | ronald.oussoren | 2010-06-22 11:32:22 +0200 (Tue, 22 Jun 2010) | 12 lines

  The code in _scproxy (a mac specific helper module to
  detect proxy settings) had the wrong logic for detecting
  if the checkbox 'Exclude simple hostnames' is checked. This
  checkin fixes that.

  As a result the test failure 'Issue8455' goes away on systems
  where the checkbox is not checked.

  I'm carefully avoiding saying that is fixes that issue,
  test_urllib2_localnet assumes that system proxy settings are
  empty (not just on OSX, see Issue8455 for details).
........
This commit is contained in:
Ronald Oussoren 2010-06-27 12:49:49 +00:00
parent a5dae25b3b
commit 3d3ffd8c44
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/Modules/_scproxy.c
View File

@ -68,7 +68,7 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__)))
aNum = CFDictionaryGetValue(proxyDict, aNum = CFDictionaryGetValue(proxyDict,
kSCPropNetProxiesExcludeSimpleHostnames); kSCPropNetProxiesExcludeSimpleHostnames);
if (aNum == NULL) { if (aNum == NULL) {
v = PyBool_FromLong(1); v = PyBool_FromLong(0);
} else { } else {
v = PyBool_FromLong(cfnum_to_int32(aNum)); v = PyBool_FromLong(cfnum_to_int32(aNum));
} }