Skip to content

Commit a1db392

Browse files
committed
comment-out proxy handling in UrlService
1 parent 8c5fe2f commit a1db392

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

python.d/python_modules/base.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -416,24 +416,24 @@ def __add_openers(self):
416416

417417
# Proxy handling
418418
# TODO currently self.proxies isn't parsed from configuration file
419-
if len(self.proxies) > 0:
420-
for proxy in self.proxies:
421-
url = proxy['url']
422-
# TODO test this:
423-
if "user" in proxy and "pass" in proxy:
424-
if url.lower().startswith('https://'):
425-
url = 'https://' + proxy['user'] + ':' + proxy['pass'] + '@' + url[8:]
426-
else:
427-
url = 'http://' + proxy['user'] + ':' + proxy['pass'] + '@' + url[7:]
428-
# FIXME move proxy auth to sth like this:
429-
# passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
430-
# passman.add_password(None, url, proxy['user'], proxy['password'])
431-
# opener.add_handler(urllib2.HTTPBasicAuthHandler(passman))
432-
433-
if url.lower().startswith('https://'):
434-
opener.add_handler(urllib2.ProxyHandler({'https': url}))
435-
else:
436-
opener.add_handler(urllib2.ProxyHandler({'https': url}))
419+
# if len(self.proxies) > 0:
420+
# for proxy in self.proxies:
421+
# url = proxy['url']
422+
# # TODO test this:
423+
# if "user" in proxy and "pass" in proxy:
424+
# if url.lower().startswith('https://'):
425+
# url = 'https://' + proxy['user'] + ':' + proxy['pass'] + '@' + url[8:]
426+
# else:
427+
# url = 'http://' + proxy['user'] + ':' + proxy['pass'] + '@' + url[7:]
428+
# # FIXME move proxy auth to sth like this:
429+
# # passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
430+
# # passman.add_password(None, url, proxy['user'], proxy['password'])
431+
# # opener.add_handler(urllib2.HTTPBasicAuthHandler(passman))
432+
#
433+
# if url.lower().startswith('https://'):
434+
# opener.add_handler(urllib2.ProxyHandler({'https': url}))
435+
# else:
436+
# opener.add_handler(urllib2.ProxyHandler({'https': url}))
437437

438438
# HTTP Basic Auth
439439
if self.user is not None and self.password is not None:

0 commit comments

Comments
 (0)