diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-06 14:12:19 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-06 14:12:19 -0800 |
| commit | 5b4df5813c20fe96f117d0201965b52e86a1a66d (patch) | |
| tree | d991f61bc824ca1b1b92bf7fb16fe3dacd4b1335 /Modules/_scproxy.c | |
| parent | 3e0bdff8a0793d305b972f4a653e4698d440b3ae (diff) | |
| parent | 95b272b4e0d5438a12702e51e05d03f5a5a8e505 (diff) | |
| download | cpython-5b4df5813c20fe96f117d0201965b52e86a1a66d.tar.gz | |
Includes ensurepip and venv packages in nuget package.
Diffstat (limited to 'Modules/_scproxy.c')
| -rw-r--r-- | Modules/_scproxy.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c index 66b6e3439f..1ce4b776f3 100644 --- a/Modules/_scproxy.c +++ b/Modules/_scproxy.c @@ -71,16 +71,12 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__))) result = PyDict_New(); if (result == NULL) goto error; - if (&kSCPropNetProxiesExcludeSimpleHostnames != NULL) { - aNum = CFDictionaryGetValue(proxyDict, - kSCPropNetProxiesExcludeSimpleHostnames); - if (aNum == NULL) { - v = PyBool_FromLong(0); - } else { - v = PyBool_FromLong(cfnum_to_int32(aNum)); - } - } else { + aNum = CFDictionaryGetValue(proxyDict, + kSCPropNetProxiesExcludeSimpleHostnames); + if (aNum == NULL) { v = PyBool_FromLong(0); + } else { + v = PyBool_FromLong(cfnum_to_int32(aNum)); } if (v == NULL) goto error; @@ -130,7 +126,7 @@ error: } static int -set_proxy(PyObject* proxies, char* proto, CFDictionaryRef proxyDict, +set_proxy(PyObject* proxies, const char* proto, CFDictionaryRef proxyDict, CFStringRef enabledKey, CFStringRef hostKey, CFStringRef portKey) { |