From ebe71a1d083e16a136403a4197271bad66a4c994 Mon Sep 17 00:00:00 2001 From: samschott Date: Thu, 4 May 2023 23:30:15 +0200 Subject: [PATCH 1/3] read SOCKS proxies from macOS System Configuration --- Modules/_scproxy.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c index 344b66f9aad522..8cf6f309e3d685 100644 --- a/Modules/_scproxy.c +++ b/Modules/_scproxy.c @@ -206,6 +206,11 @@ get_proxies(PyObject* Py_UNUSED(mod), PyObject *Py_UNUSED(ignored)) kSCPropNetProxiesGopherProxy, kSCPropNetProxiesGopherPort); if (r == -1) goto error; + r = set_proxy(result, "socks", proxyDict, + kSCPropNetProxiesSOCKSEnable, + kSCPropNetProxiesSOCKSProxy, + kSCPropNetProxiesSOCKSPort); + if (r == -1) goto error; CFRelease(proxyDict); return result; From 6033fcf72939af39c0525041abfa4c650175c3d1 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 21:48:00 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst diff --git a/Misc/NEWS.d/next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst b/Misc/NEWS.d/next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst new file mode 100644 index 00000000000000..5f9b7f612dc6c1 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst @@ -0,0 +1 @@ +Support reading SOCKS proxy configuration from macOS System Configuration. From 684b8284509bc4e9146bbadd2ec3fbb745f238d0 Mon Sep 17 00:00:00 2001 From: samschott Date: Fri, 5 May 2023 20:42:10 +0200 Subject: [PATCH 3/3] Update Misc/NEWS.d/next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst Co-authored-by: Oleg Iarygin --- .../next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/Misc/NEWS.d/next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst b/Misc/NEWS.d/next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst index 5f9b7f612dc6c1..b6b18dcfd81394 100644 --- a/Misc/NEWS.d/next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst +++ b/Misc/NEWS.d/next/macOS/2023-05-04-21-47-59.gh-issue-104180.lEJCwd.rst @@ -1 +1,2 @@ Support reading SOCKS proxy configuration from macOS System Configuration. +Patch by Sam Schott.