Merged revisions 82150 via svnmerge from

ronaldoussoren · ronaldoussoren · commit 7adeed324c00 · 2010-06-27T12:51:31.000Z
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).
........
diff --git 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));
         }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__)))`
`75`	`75`	`aNum = CFDictionaryGetValue(proxyDict,`
`76`	`76`	`kSCPropNetProxiesExcludeSimpleHostnames);`
`77`	`77`	`if (aNum == NULL) {`
`78`		`- v = PyBool_FromLong(1);`
	`78`	`+ v = PyBool_FromLong(0);`
`79`	`79`	`} else {`
`80`	`80`	`v = PyBool_FromLong(cfnum_to_int32(aNum));`
`81`	`81`	`}`