From 7f82f45e70c343462e53233e10fcd0ddb684d049 Mon Sep 17 00:00:00 2001 From: Johann Broudin Date: Fri, 14 Mar 2014 10:49:03 +0100 Subject: [PATCH] correct the usage of proxy, timeout and ssl verification in browser2 --- weboob/tools/browser2/browser.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/weboob/tools/browser2/browser.py b/weboob/tools/browser2/browser.py index 045ce94c..4e021f71 100644 --- a/weboob/tools/browser2/browser.py +++ b/weboob/tools/browser2/browser.py @@ -127,11 +127,12 @@ class BaseBrowser(object): VERIFY = True SAVE_RESPONSES = False + PROXIES = None + def __init__(self, logger=None, proxy=None, responses_dirname=None): self.logger = getLogger('browser', logger) + self.PROXIES = proxy self._setup_session(self.PROFILE) - if proxy is not None: - self.session.proxies = proxy self.url = None self.response = None @@ -193,6 +194,8 @@ class BaseBrowser(object): """ session = requests.Session() + session.proxies = self.PROXIES + session.verify = self.VERIFY if self.TIMEOUT: session.timeout = self.TIMEOUT @@ -261,6 +264,15 @@ class BaseBrowser(object): req = self.build_request(url, referrer, **kwargs) 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 response = self.session.send(preq, allow_redirects=allow_redirects,