Skip to content

Commit feec19b

Browse files
committed
Use per-thread requests sessions
Reason is requests.Session is not thread-safe See: psf/requests#2766
1 parent 1a80fc5 commit feec19b

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

‎telebot/apihelper.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from telebot import util
1919

2020
logger = telebot.logger
21-
req_session = requests.session()
2221
proxy = None
2322

2423
API_URL = "https://api.telegram.org/bot{0}/{1}"
@@ -28,6 +27,10 @@
2827
READ_TIMEOUT = 9999
2928

3029

30+
def _get_req_session():
31+
return util.per_thread('req_session', lambda: requests.session())
32+
33+
3134
def _make_request(token, method_name, method='get', params=None, files=None, base_url=API_URL):
3235
"""
3336
Makes a request to the Telegram API.
@@ -47,8 +50,8 @@ def _make_request(token, method_name, method='get', params=None, files=None, bas
4750
if params:
4851
if 'timeout' in params: read_timeout = params['timeout'] + 10
4952
if 'connect-timeout' in params: connect_timeout = params['connect-timeout'] + 10
50-
result = req_session.request(method, request_url, params=params, files=files,
51-
timeout=(connect_timeout, read_timeout), proxies=proxy)
53+
result = _get_req_session().req_session.request(method, request_url, params=params, files=files,
54+
timeout=(connect_timeout, read_timeout), proxies=proxy)
5255
logger.debug("The server returned: '{0}'".format(result.text.encode('utf8')))
5356
return _check_result(method_name, result)['result']
5457

@@ -97,7 +100,7 @@ def get_file(token, file_id):
97100

98101
def download_file(token, file_path):
99102
url = FILE_URL.format(token, file_path)
100-
result = req_session.get(url)
103+
result = _get_req_session().get(url)
101104
if result.status_code != 200:
102105
msg = 'The server returned HTTP {0} {1}. Response body:\n[{2}]' \
103106
.format(result.status_code, result.reason, result.text)

0 commit comments

Comments
 (0)