From 3d3ffd8c44a50645d04aa5b8ca503df0b5089c1f Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Sun, 27 Jun 2010 12:49:49 +0000 Subject: [PATCH] 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). ........ --- Mac/Modules/_scproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mac/Modules/_scproxy.c b/Mac/Modules/_scproxy.c index dd5a2930180..b393fd14cc0 100644 --- a/Mac/Modules/_scproxy.c +++ b/Mac/Modules/_scproxy.c @@ -68,7 +68,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)); }