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

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;

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
 -------------