From ddd8679c9d2d2ca55bab5a3bc400d8d1e7ce19df Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 29 Jul 2011 22:01:43 -0600 Subject: [PATCH] News download: Support https proxies --- src/calibre/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index 7df3699234..1456b62638 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -353,9 +353,14 @@ def browser(honor_time=True, max_time=2, mobile_browser=False, user_agent=None): if user_agent is None: user_agent = USER_AGENT_MOBILE if mobile_browser else USER_AGENT opener.addheaders = [('User-agent', user_agent)] - http_proxy = get_proxies().get('http', None) + proxies = get_proxies() + http_proxy = proxies.get('http', None) if http_proxy: opener.set_proxies({'http':http_proxy}) + https_proxy = proxies.get('https', None) + if https_proxy: + opener.set_proxies({'https':https_proxy}) + return opener def fit_image(width, height, pwidth, pheight):