From c211c60e525a91f4ce2d4ad95c0791046d4f5d4d Mon Sep 17 00:00:00 2001 From: Junaid Loonat Date: Mon, 25 Apr 2016 22:12:52 +0200 Subject: [PATCH] Removed HTTP(S) proxy code The HTTP(S) proxy is now set globally from the configuration logic. --- src/utils/web.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/utils/web.py b/src/utils/web.py index bc37eff9d..9589b161e 100644 --- a/src/utils/web.py +++ b/src/utils/web.py @@ -57,7 +57,6 @@ if minisix.PY2: return urllib.urlencode(*args, **kwargs).encode() from urllib2 import HTTPError, URLError from urllib import splithost, splituser - from urllib2 import build_opener, install_opener, ProxyHandler else: from http.client import InvalidURL from urllib.parse import urlsplit, urlunsplit, urlparse @@ -73,7 +72,6 @@ else: return urllib.parse.urlencode(*args, **kwargs) from urllib.error import HTTPError, URLError from urllib.parse import splithost, splituser - from urllib.request import build_opener, install_opener, ProxyHandler class Error(Exception): pass @@ -145,14 +143,6 @@ def getUrlFd(url, headers=None, data=None, timeout=None): else: request = url request.add_data(data) - httpProxy = force(proxy) - if httpProxy: - proxyHandler = ProxyHandler({ - 'http': httpProxy, - 'https': httpProxy - }) - proxyOpener = build_opener(proxyHandler) - install_opener(proxyOpener) fd = urlopen(request, timeout=timeout) return fd except socket.timeout as e: