diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-06-27 12:51:31 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-06-27 12:51:31 (GMT) |
| commit | 7adeed324c001e74f9509bf52ba002c1fe1efaca (patch) | |
| tree | 7bf11438386871f53029000de4fa33574f379f38 /Modules | |
| parent | 0f377a53a5e9aaee46db2adaa1dd2f2d3723ce53 (diff) | |
| download | cpython-7adeed324c001e74f9509bf52ba002c1fe1efaca.zip cpython-7adeed324c001e74f9509bf52ba002c1fe1efaca.tar.gz cpython-7adeed324c001e74f9509bf52ba002c1fe1efaca.tar.bz2 | |
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).
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_scproxy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c index 30afa6a..af11ba7 100644 --- a/Modules/_scproxy.c +++ b/Modules/_scproxy.c @@ -75,7 +75,7 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__))) aNum = CFDictionaryGetValue(proxyDict, kSCPropNetProxiesExcludeSimpleHostnames); if (aNum == NULL) { - v = PyBool_FromLong(1); + v = PyBool_FromLong(0); } else { v = PyBool_FromLong(cfnum_to_int32(aNum)); } |