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

add ssl proxy support to browser and browser2 and add the option _proxy_ssl

Browse source
This commit is contained in:
Johann Broudin 2014-03-13 19:12:33 +01:00 • committed by Romain Bignon
commit 0f1726d01c
3 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
weboob/tools/backend.py
View file

@ -313,12 +313,31 @@ class BaseBackend(object):
if not self.BROWSER:
return None
tmpproxy = None
tmpproxys = None
if '_proxy' in self._private_config:
kwargs['proxy'] = self._private_config['_proxy']
tmpproxy = self._private_config['_proxy']
elif 'http_proxy' in os.environ:
kwargs['proxy'] = os.environ['http_proxy']
tmpproxy = os.environ['http_proxy']
elif 'HTTP_PROXY' in os.environ:
kwargs['proxy'] = os.environ['HTTP_PROXY']
tmpproxy = os.environ['HTTP_PROXY']
if '_proxys' in self._private_config:
tmpproxys = self._private_config['_proxy_ssl']
elif 'https_proxy' in os.environ:
tmpproxys = os.environ['https_proxy']
elif 'HTTPS_PROXY' in os.environ:
tmpproxys = os.environ['HTTPS_PROXY']
print tmpproxys
if tmpproxy is not None or tmpproxys is not None:
kwargs['proxy'] = {}
if tmpproxy is not None:
kwargs['proxy']['http'] = tmpproxy
if tmpproxys is not None:
kwargs['proxy']['https'] = tmpproxys
kwargs['logger'] = self.logger
if hasattr(self.BROWSER, 'SAVE_RESPONSES') and self.BROWSER.SAVE_RESPONSES and self.BROWSER.responses_dirname: