[Python-checkins] r82280 - in python/branches/release26-maint: Mac/Modules/_scproxy.c

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Jun 27 14:49:49 2010
New Revision: 82280

Log:
Merged revisions 82150 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82150 | ronald.oussoren | 2010-06-22 11:32:22 +0200 (Tue, 22 Jun 2010) | 12 lines
  
  The code in _scproxy (a mac specific helper module to 
  detect proxy settings) had the wrong logic for detecting
  if the checkbox 'Exclude simple hostnames' is checked. This
  checkin fixes that.
  
  As a result the test failure 'Issue8455' goes away on systems
  where the checkbox is not checked.
  
  I'm carefully avoiding saying that is fixes that issue,
  test_urllib2_localnet assumes that system proxy settings are
  empty (not just on OSX, see Issue8455 for details).
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Mac/Modules/_scproxy.c

Modified: python/branches/release26-maint/Mac/Modules/_scproxy.c
==============================================================================
--- python/branches/release26-maint/Mac/Modules/_scproxy.c	(original)
+++ python/branches/release26-maint/Mac/Modules/_scproxy.c	Sun Jun 27 14:49:49 2010
@@ -68,7 +68,7 @@
         aNum = CFDictionaryGetValue(proxyDict,
             kSCPropNetProxiesExcludeSimpleHostnames);
         if (aNum == NULL) {
-            v = PyBool_FromLong(1);
+            v = PyBool_FromLong(0);
         } else {
             v = PyBool_FromLong(cfnum_to_int32(aNum));
         }