Merged revisions 85062 via svnmerge from

ronaldoussoren · ronaldoussoren · commit 8928e32cb009 · 2010-09-28T14:43:59.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85062 | ronald.oussoren | 2010-09-28 16:38:31 +0200 (Tue, 28 Sep 2010) | 3 lines Fix for issue python#9568. ........
diff --git a/Mac/Modules/_scproxy.c b/Mac/Modules/_scproxy.c
@@ -73,7 +73,7 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__)))
             v = PyBool_FromLong(cfnum_to_int32(aNum));
         }
     }  else {
-        v = PyBool_FromLong(1);
+        v = PyBool_FromLong(0);
     }
 
     if (v == NULL) goto error;
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -405,6 +405,8 @@ Tests
 
 - Issue #8605: Skip test_gdb if Python is compiled with optimizations.
 
+- Issue #9568: Fix test_urllib2_localnet on OS X 10.3.
+
 Documentation
 -------------
 

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