mirror/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Code Releases Activity

Merge branch 'eternnoir:master' into master

Browse Source
This commit is contained in:
_run 2022-05-01 23:20:02 +05:00 committed by GitHub
commit a7db2d8d9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -656,6 +656,8 @@ telebot.logger.setLevel(logging.DEBUG) # Outputs debug messages to console.
``` ```
### Proxy ### Proxy
For sync:
You can use proxy for request. `apihelper.proxy` object will use by call `requests` proxies argument. You can use proxy for request. `apihelper.proxy` object will use by call `requests` proxies argument.
```python ```python
@ -670,6 +672,14 @@ If you want to use socket5 proxy you need install dependency `pip install reques
apihelper.proxy = {'https':'socks5://userproxy:password@proxy_address:port'} apihelper.proxy = {'https':'socks5://userproxy:password@proxy_address:port'}
``` ```
For async:
```python
from telebot import asyncio_helper
asyncio_helper.proxy = 'http://127.0.0.1:3128' #url
```
### Testing ### Testing
You can disable or change the interaction with real Telegram server by using You can disable or change the interaction with real Telegram server by using
```python ```python

4
telebot/asyncio_helper.py
View File

@ -60,7 +60,7 @@ async def _process_request(token, url, method='get', params=None, files=None, re
while not got_result and current_try<MAX_RETRIES-1: while not got_result and current_try<MAX_RETRIES-1:
current_try +=1 current_try +=1
try: try:
async with session.request(method=method, url=API_URL.format(token, url), data=params, timeout=timeout) as resp: async with session.request(method=method, url=API_URL.format(token, url), data=params, timeout=timeout, proxy=proxy) as resp:
logger.debug("Request: method={0} url={1} params={2} files={3} request_timeout={4} current_try={5}".format(method, url, params, files, request_timeout, current_try).replace(token, token.split(':')[0] + ":{TOKEN}")) logger.debug("Request: method={0} url={1} params={2} files={3} request_timeout={4} current_try={5}".format(method, url, params, files, request_timeout, current_try).replace(token, token.split(':')[0] + ":{TOKEN}"))
json_result = await _check_result(url, resp) json_result = await _check_result(url, resp)
if json_result: if json_result:
@ -71,7 +71,7 @@ async def _process_request(token, url, method='get', params=None, files=None, re
except aiohttp.ClientError as e: except aiohttp.ClientError as e:
logger.error('Aiohttp ClientError: {0}'.format(e.__class__.__name__)) logger.error('Aiohttp ClientError: {0}'.format(e.__class__.__name__))
except Exception as e: except Exception as e:
logger.error(f'Unkown error: {e.__class__.__name__}') logger.error(f'Unknown error: {e.__class__.__name__}')
if not got_result: if not got_result:
raise RequestTimeout("Request timeout. Request: method={0} url={1} params={2} files={3} request_timeout={4}".format(method, url, params, files, request_timeout, current_try)) raise RequestTimeout("Request timeout. Request: method={0} url={1} params={2} files={3} request_timeout={4}".format(method, url, params, files, request_timeout, current_try))