Merged revisions 82281 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r82281 | ronald.oussoren | 2010-06-27 14:51:31 +0200 (Sun, 27 Jun 2010) | 19 lines 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). ........ ................

--- a/Modules/_scproxy.c	Sun Jun 27 12:46:19 2010 +0000
+++ b/Modules/_scproxy.c	Sun Jun 27 12:52:17 2010 +0000
@@ -75,7 +75,7 @@
         aNum = CFDictionaryGetValue(proxyDict,
             kSCPropNetProxiesExcludeSimpleHostnames);
         if (aNum == NULL) {
-            v = PyBool_FromLong(1);
+            v = PyBool_FromLong(0);
         } else {
             v = PyBool_FromLong(cfnum_to_int32(aNum));
         }