Merged revisions 80243 via svnmerge from

ronaldoussoren · ronaldoussoren · commit fd4ef551eaeb · 2010-04-20T09:57:18.000Z
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 python#8095. ........
diff --git a/Mac/Modules/_scproxy.c b/Mac/Modules/_scproxy.c
@@ -64,13 +64,18 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__)))
 	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);
