traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
........
This commit is contained in:
Ronald Oussoren 2010-04-20 09:57:18 +00:00
parent 488fea3cca
commit fd4ef551ea
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Mac/Modules/_scproxy.c
View File

@ -64,13 +64,18 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__)))
result = PyDict_New(); result = PyDict_New();
if (result == NULL) goto error; if (result == NULL) goto error;
aNum = CFDictionaryGetValue(proxyDict, if (&kSCPropNetProxiesExcludeSimpleHostnames != NULL) {
aNum = CFDictionaryGetValue(proxyDict,
kSCPropNetProxiesExcludeSimpleHostnames); kSCPropNetProxiesExcludeSimpleHostnames);
if (aNum == NULL) { if (aNum == NULL) {
v = PyBool_FromLong(0); v = PyBool_FromLong(1);
} else { } else {
v = PyBool_FromLong(cfnum_to_int32(aNum)); v = PyBool_FromLong(cfnum_to_int32(aNum));
}
} else {
v = PyBool_FromLong(1);
} }
if (v == NULL) goto error; if (v == NULL) goto error;
r = PyDict_SetItemString(result, "exclude_simple", v); r = PyDict_SetItemString(result, "exclude_simple", v);