From d6dab74e30cc5cd9fb52aed7cbef95aaa36dc59f Mon Sep 17 00:00:00 2001 From: Glenn Smith Date: Fri, 14 May 2021 15:53:10 -0400 Subject: Network Settings --- python/downloadprovider.py | 8 ++++---- python/scriptingprovider.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'python') diff --git a/python/downloadprovider.py b/python/downloadprovider.py index e6c1b81f..2e43128f 100644 --- a/python/downloadprovider.py +++ b/python/downloadprovider.py @@ -371,7 +371,7 @@ try: def perform_request(self, url): try: - proxy_setting = settings.Settings().get_string('downloadClient.httpsProxy') + proxy_setting = settings.Settings().get_string('network.httpsProxy') if proxy_setting: proxies = {"https": proxy_setting} else: @@ -406,7 +406,7 @@ try: def perform_custom_request(self, method, url, headers, data): try: - proxy_setting = settings.Settings().get_string('downloadClient.httpsProxy') + proxy_setting = settings.Settings().get_string('network.httpsProxy') if proxy_setting: proxies = {"https": proxy_setting} else: @@ -462,7 +462,7 @@ if not _loaded and (sys.platform != "win32") and (sys.version_info >= (2, 7, 9)) def perform_request(self, url): try: - proxy_setting = settings.Settings().get_string('downloadClient.httpsProxy') + proxy_setting = settings.Settings().get_string('network.httpsProxy') if proxy_setting: opener = build_opener(ProxyHandler({'https': proxy_setting})) install_opener(opener) @@ -524,7 +524,7 @@ if not _loaded and (sys.platform != "win32") and (sys.version_info >= (2, 7, 9)) def perform_custom_request(self, method, url, headers, data): result = None try: - proxy_setting = settings.Settings().get_string('downloadClient.httpsProxy') + proxy_setting = settings.Settings().get_string('network.httpsProxy') if proxy_setting: opener = build_opener(ProxyHandler({'https': proxy_setting})) install_opener(opener) diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py index 76d41cbd..5417e47e 100644 --- a/python/scriptingprovider.py +++ b/python/scriptingprovider.py @@ -934,7 +934,7 @@ class PythonScriptingProvider(ScriptingProvider): return False args = [str(python_bin), "-m", "pip", "--isolated", "--disable-pip-version-check"] - proxy_settings = settings.Settings().get_string("downloadClient.httpsProxy") + proxy_settings = settings.Settings().get_string("network.httpsProxy") if proxy_settings: args.extend(["--proxy", proxy_settings]) -- cgit v1.3.1