From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 28 Sep 2010 14:40:22 +0000 (+0000)
Subject: Merged revisions 85062 via svnmerge from
X-Git-Tag: v3.1.3rc1~194
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9355de31bd49932c712f06a987ab50fe009e509;p=thirdparty%2FPython%2Fcpython.git

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 e761f2aad17c..ee5a3fa8d61c 100644
--- 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 af11ba7472b7..3b2a38ea32fa 100644
--- 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;