comment-out proxy handling in UrlService
paulfantom committed
Jul 23, 2016 at 21:58 UTC
a1db392a0a8cb55ab6dc353365992155b3632b1c
1 file changed
+18
-18
python.d/python_modules/base.py
+18
-18
@@ -416,24 +416,24 @@ class UrlService(SimpleService):
416
417
# Proxy handling
418
# 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}))
437
438
# HTTP Basic Auth
439
if self.user is not None and self.password is not None: