nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

correct the usage of proxy, timeout and ssl verification in browser2

Browse source
This commit is contained in:
Johann Broudin 2014-03-14 10:49:03 +01:00 • committed by Romain Bignon
commit 7f82f45e70
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
weboob/tools/browser2/browser.py
View file

@ -127,11 +127,12 @@ class BaseBrowser(object):
VERIFY = True VERIFY = True
SAVE_RESPONSES = False SAVE_RESPONSES = False
PROXIES = None
def __init__(self, logger=None, proxy=None, responses_dirname=None): def __init__(self, logger=None, proxy=None, responses_dirname=None):
self.logger = getLogger('browser', logger) self.logger = getLogger('browser', logger)
self.PROXIES = proxy
self._setup_session(self.PROFILE) self._setup_session(self.PROFILE)
if proxy is not None:
self.session.proxies = proxy
self.url = None self.url = None
self.response = None self.response = None
@ -193,6 +194,8 @@ class BaseBrowser(object):
""" """
session = requests.Session() session = requests.Session()
session.proxies = self.PROXIES
session.verify = self.VERIFY session.verify = self.VERIFY
if self.TIMEOUT: if self.TIMEOUT:
session.timeout = self.TIMEOUT session.timeout = self.TIMEOUT
@ -261,6 +264,15 @@ class BaseBrowser(object):
req = self.build_request(url, referrer, **kwargs) req = self.build_request(url, referrer, **kwargs)
preq = self.session.prepare_request(req) preq = self.session.prepare_request(req)
if proxies is None:
proxies = self.PROXIES
if verify is None:
verify = self.VERIFY
if timeout is None:
timeout = self.TIMEOUT
# call python-requests # call python-requests
response = self.session.send(preq, response = self.session.send(preq,
allow_redirects=allow_redirects, allow_redirects=allow_redirects,