Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix calibre not supporting different http and https proxies. Fixes #960173 (Proxy error with multiple "*_proxy" environment variables under GNU/Linux)

Browse Source
This commit is contained in:
Kovid Goyal 2012-03-20 18:51:53 +05:30
parent 9915d4b963
commit 6b12bc2e56
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/__init__.py
View File

@ -381,12 +381,15 @@ def browser(honor_time=True, max_time=2, mobile_browser=False, user_agent=None):
user_agent = USER_AGENT_MOBILE if mobile_browser else USER_AGENT user_agent = USER_AGENT_MOBILE if mobile_browser else USER_AGENT
opener.addheaders = [('User-agent', user_agent)] opener.addheaders = [('User-agent', user_agent)]
proxies = get_proxies() proxies = get_proxies()
to_add = {}
http_proxy = proxies.get('http', None) http_proxy = proxies.get('http', None)
if http_proxy: if http_proxy:
opener.set_proxies({'http':http_proxy}) to_add['http'] = http_proxy
https_proxy = proxies.get('https', None) https_proxy = proxies.get('https', None)
if https_proxy: if https_proxy:
opener.set_proxies({'https':https_proxy}) to_add['https'] = https_proxy
if to_add:
opener.set_proxies(to_add)
return opener return opener