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

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue Apr 20 11:57:18 2010
New Revision: 80254

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

........
  r80243 | ronald.oussoren | 2010-04-20 10:54:48 +0200 (Tue, 20 Apr 2010) | 3 lines
  
  This patch fixes the handling of a weak-linked
  variable and should fix issue #8095.
........


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	Tue Apr 20 11:57:18 2010
@@ -64,13 +64,18 @@
 	result = PyDict_New();
 	if (result == NULL) goto error;
 
-	aNum = CFDictionaryGetValue(proxyDict, 
+	if (&kSCPropNetProxiesExcludeSimpleHostnames != NULL) {
+		aNum = CFDictionaryGetValue(proxyDict, 
 			kSCPropNetProxiesExcludeSimpleHostnames);
-	if (aNum == NULL) {
-		v = PyBool_FromLong(0);
-	} else {
-		v = PyBool_FromLong(cfnum_to_int32(aNum));
+		if (aNum == NULL) {
+			v = PyBool_FromLong(1);
+		} else {
+			v = PyBool_FromLong(cfnum_to_int32(aNum));
+		}
+	}  else {
+		v = PyBool_FromLong(1);
 	}
+
 	if (v == NULL) goto error;
 
 	r = PyDict_SetItemString(result, "exclude_simple", v);