Merged revisions 85062 via svnmerge from

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 #9568.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index e761f2aad17ce6bf56f80808ce240d546af12a55..ee5a3fa8d61cce08fc729cce2c497c09ea110e0b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -650,6 +650,7 @@ Tests
 
 - Issue #8193: Fix test_zlib failure with zlib 1.2.4.
 
+- Issue #9568: Fix test_urllib2_localnet on OS X 10.3.
 
 Documentation
 -------------

diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c
index af11ba7472b793da958eefa567bc213f7f161304..3b2a38ea32faae53590f4c13adbd61f0daaa6efb 100644 (file)
--- a/Modules/_scproxy.c
+++ b/Modules/_scproxy.c
@@ -80,7 +80,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;