From 215c1f5abd1c282fbfa7a5806181252626df94dd Mon Sep 17 00:00:00 2001 From: Josue Kouka Date: Mon, 2 Jul 2018 14:26:33 +0200 Subject: [PATCH] use REQUESTS_PROXIES instead of A2_FC_REQUESTS_PROXIES (#24929) --- src/authentic2_auth_fc/app_settings.py | 4 ---- src/authentic2_auth_fc/utils.py | 2 +- tests/test_auth_fc.py | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/authentic2_auth_fc/app_settings.py b/src/authentic2_auth_fc/app_settings.py index 9ce9a26..bd16a0e 100644 --- a/src/authentic2_auth_fc/app_settings.py +++ b/src/authentic2_auth_fc/app_settings.py @@ -108,10 +108,6 @@ class AppSettings(object): def scopes(self): return self._setting('SCOPES', []) - @property - def requests_proxies(self): - return self._setting('REQUESTS_PROXIES', {}) - import sys diff --git a/src/authentic2_auth_fc/utils.py b/src/authentic2_auth_fc/utils.py index 2e99dde..6037ee6 100644 --- a/src/authentic2_auth_fc/utils.py +++ b/src/authentic2_auth_fc/utils.py @@ -183,5 +183,5 @@ def requests_retry_session( session.mount('http://', adapter) session.mount('https://', adapter) # set proxies - session.proxies.update(app_settings.requests_proxies) + session.proxies.update(getattr(settings, 'REQUESTS_PROXIES', {})) return session diff --git a/tests/test_auth_fc.py b/tests/test_auth_fc.py index 7a132d6..dfaeb7f 100644 --- a/tests/test_auth_fc.py +++ b/tests/test_auth_fc.py @@ -228,7 +228,7 @@ def test_requests_proxies_support(app, fc_settings, caplog): session = requests_retry_session(session=other_session) assert session is other_session assert session.proxies == {'http': 'http://example.net'} - fc_settings.A2_FC_REQUESTS_PROXIES = {'https': 'http://pubproxy.com/api/proxy'} + fc_settings.REQUESTS_PROXIES = {'https': 'http://pubproxy.com/api/proxy'} session = requests_retry_session() assert session.proxies == {'https': 'http://pubproxy.com/api/proxy'}