From 9dc1e9ff1af1709eecd3114b89778b18e1498cc2 Mon Sep 17 00:00:00 2001 From: jrootjunior Date: Thu, 12 Dec 2019 11:58:21 +0200 Subject: [PATCH] Rename run to run_polling --- aiogram/dispatcher/dispatcher.py | 8 +++++--- tests/test_dispatcher/test_dispatcher.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/aiogram/dispatcher/dispatcher.py b/aiogram/dispatcher/dispatcher.py index 4984b212..b7e68265 100644 --- a/aiogram/dispatcher/dispatcher.py +++ b/aiogram/dispatcher/dispatcher.py @@ -121,7 +121,7 @@ class Dispatcher(Router): await self.process_update(update=update, bot=bot, **kwargs) async def _run_polling(self, *bots: Bot, **kwargs: Any) -> None: - async with self._running_lock: # Prevent to run this method twice at a once + async with self._running_lock: # Prevent to run_polling this method twice at a once workflow_data = {"dispatcher": self, "bots": bots, "bot": bots[-1]} workflow_data.update(kwargs) await self.emit_startup(**workflow_data) @@ -129,7 +129,7 @@ class Dispatcher(Router): try: coro_list = [] for bot in bots: - async with bot.context(): + async with bot.context(auto_close=False): user: User = await bot.me() loggers.dispatcher.info( "Run polling for bot @%s id=%d - %r", @@ -140,10 +140,12 @@ class Dispatcher(Router): coro_list.append(self._polling(bot=bot, **kwargs)) await asyncio.gather(*coro_list) finally: + for bot in bots: + await bot.close() loggers.dispatcher.info("Polling stopped") await self.emit_shutdown(**workflow_data) - def run(self, *bots: Bot, **kwargs: Any): + def run_polling(self, *bots: Bot, **kwargs: Any): """ Run many bots with polling diff --git a/tests/test_dispatcher/test_dispatcher.py b/tests/test_dispatcher/test_dispatcher.py index 42abb826..c85b288b 100644 --- a/tests/test_dispatcher/test_dispatcher.py +++ b/tests/test_dispatcher/test_dispatcher.py @@ -192,5 +192,5 @@ class TestDispatcher: def test_run(self, bot: MockedBot): dispatcher = Dispatcher() with patch("aiogram.dispatcher.dispatcher.Dispatcher._run_polling") as patched_run_polling: - dispatcher.run(bot) + dispatcher.run_polling(bot) patched_run_polling.assert_awaited_once()