use REQUESTS_PROXIES instead of A2_FC_REQUESTS_PROXIES (#24929)

This commit is contained in:
Josue Kouka 2018-07-02 14:26:33 +02:00
parent 38cc81860e
commit 215c1f5abd
3 changed files with 2 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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'}