From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 20 Apr 2010 09:57:18 +0000 (+0000)
Subject: Merged revisions 80243 via svnmerge from
X-Git-Tag: v2.6.6rc1~430
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd4ef551eaeb0d9db0cccc6cb72e2b658a8b3cf2;p=python

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

diff --git a/Mac/Modules/_scproxy.c b/Mac/Modules/_scproxy.c
index 003f6a483f..9f4c1a4e8f 100644
--- 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);