From d1930a1ea0da117eab544c88cc67f41ba96b65ab Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 5 Oct 2011 09:58:56 -0600 Subject: [PATCH] Handle https proxies specified with a http:// URL --- src/calibre/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index 358a7ee4bf..7790e91bea 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -278,6 +278,8 @@ def get_proxies(debug=True): continue if proxy.startswith(key+'://'): proxy = proxy[len(key)+3:] + if key == 'https' and proxy.startswith('http://'): + proxy = proxy[7:] if proxy.endswith('/'): proxy = proxy[:-1] if len(proxy) > 4: