[Python-checkins] r85063 - in python/branches/release31-maint: Misc/NEWS Modules/_scproxy.c

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue Sep 28 16:40:22 2010
New Revision: 85063

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/_scproxy.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Sep 28 16:40:22 2010
@@ -650,6 +650,7 @@
 
 - Issue #8193: Fix test_zlib failure with zlib 1.2.4.
 
+- Issue #9568: Fix test_urllib2_localnet on OS X 10.3.
 
 Documentation
 -------------

Modified: python/branches/release31-maint/Modules/_scproxy.c
==============================================================================
--- python/branches/release31-maint/Modules/_scproxy.c	(original)
+++ python/branches/release31-maint/Modules/_scproxy.c	Tue Sep 28 16:40:22 2010
@@ -80,7 +80,7 @@
             v = PyBool_FromLong(cfnum_to_int32(aNum));
         }
     }  else {
-        v = PyBool_FromLong(1);
+        v = PyBool_FromLong(0);
     }
 
     if (v == NULL) goto error;