diff options
| author | Glenn Smith <glenn@vector35.com> | 2021-05-14 15:53:10 -0400 |
|---|---|---|
| committer | Glenn Smith <glenn@vector35.com> | 2021-05-17 16:36:14 -0400 |
| commit | d6dab74e30cc5cd9fb52aed7cbef95aaa36dc59f (patch) | |
| tree | 01fbc301624f32e159132cd7b39904b6c9e0e8e7 | |
| parent | 24e6178f7bcad31cf7119d4947919bc35cf743d7 (diff) | |
Network Settings
| -rw-r--r-- | python/downloadprovider.py | 8 | ||||
| -rw-r--r-- | python/scriptingprovider.py | 2 | ||||
| -rw-r--r-- | suite/api_test.py | 2 |
3 files changed, 6 insertions, 6 deletions
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]) diff --git a/suite/api_test.py b/suite/api_test.py index 6cdcc44f..4e66666f 100644 --- a/suite/api_test.py +++ b/suite/api_test.py @@ -31,7 +31,7 @@ class SettingsAPI(unittest.TestCase): settings = Settings() assert settings.contains("analysis.linearSweep.autorun"), "test_settings_defaults failed" assert settings.contains("analysis.unicode.blocks"), "test_settings_defaults failed" - assert settings.contains("downloadClient.providerName"), "test_settings_defaults failed" + assert settings.contains("network.downloadProviderName"), "test_settings_defaults failed" assert settings.get_bool_with_scope("analysis.linearSweep.autorun", scope=SettingsScope.SettingsDefaultScope)[0], "test_settings_defaults failed" assert settings.get_bool_with_scope("analysis.linearSweep.autorun", scope=SettingsScope.SettingsDefaultScope)[1] == SettingsScope.SettingsDefaultScope, "test_settings_defaults failed" |