OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-12-23 06:50:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

urllib3: can now connect through proxies which require auth

Browse source 
fixes #343
This commit is contained in:
Noam Meltzer 2016-07-12 23:31:38 +03:00
parent 27e57bbf58
commit 7c908db901
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
telegram/utils/request.py
View file

@ -57,14 +57,17 @@ def _init_con_pool():
]) ])
proxy_url = _get_con_pool_proxy() proxy_url = _get_con_pool_proxy()
if not proxy_url: if not proxy_url:
mgr = urllib3.PoolManager mgr = urllib3.PoolManager(**kwargs)
else: else:
kwargs['proxy_url'] = proxy_url
if _CON_POOL_PROXY_KWARGS: if _CON_POOL_PROXY_KWARGS:
kwargs.update(_CON_POOL_PROXY_KWARGS) kwargs.update(_CON_POOL_PROXY_KWARGS)
mgr = urllib3.ProxyManager mgr = urllib3.proxy_from_url(proxy_url, **kwargs)
if mgr.proxy.auth:
# TODO: what about other auth types?
auth_hdrs = urllib3.make_headers(proxy_basic_auth=mgr.proxy.auth)
mgr.proxy_headers.update(auth_hdrs)
_CON_POOL = mgr(**kwargs) _CON_POOL = mgr
def is_con_pool_initialized(): def is_con_pool_initialized():