From 4d631a306983f221ee52557b830c60ead7e909a1 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Sun, 14 Jun 2020 17:36:14 +0300 Subject: [PATCH] Allow to use zero as request timeout --- aiogram/api/client/bot.py | 2 +- aiogram/api/client/session/aiohttp.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aiogram/api/client/bot.py b/aiogram/api/client/bot.py index 673356d9..50898e22 100644 --- a/aiogram/api/client/bot.py +++ b/aiogram/api/client/bot.py @@ -278,7 +278,7 @@ class Bot(ContextInstanceMixin["Bot"]): :param method: :return: """ - return await self.session.make_request(self.__token, method) + return await self.session.make_request(self.__token, method, timeout=request_timeout) def __hash__(self) -> int: """ diff --git a/aiogram/api/client/session/aiohttp.py b/aiogram/api/client/session/aiohttp.py index 4ecfcea9..92adc896 100644 --- a/aiogram/api/client/session/aiohttp.py +++ b/aiogram/api/client/session/aiohttp.py @@ -134,7 +134,9 @@ class AiohttpSession(BaseSession): url = self.api.api_url(token=token, method=request.method) form = self.build_form_data(request) - async with session.post(url, data=form, timeout=timeout or self.timeout) as resp: + async with session.post( + url, data=form, timeout=self.timeout if timeout is None else timeout + ) as resp: raw_result = await resp.json(loads=self.json_loads) response = call.build_response(raw_result)