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/Mac/Modules/_scproxy.c b/Mac/Modules/_scproxy.c
index b393fd14cc0e3606539e28d808fb7539762c4289..4aa6665d1350cb59647237d629d7695d53c9242c 100644 (file)
--- 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
index 083fc530d45877f1a2c3f85eb6698be494257ace..d30b05b3a6352184a8c4ba6fb6191a8d47475eb2 100644 (file)
--- 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
 -------------