Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-20 06:10:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 80243 via svnmerge from

Browse source 
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
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();
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);