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 2025-03-27 08:50:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Call Application.post_stop Only if Application.stop was called (#4211)

Browse source
This commit is contained in:
Bibo-Joshi 2024-05-20 15:52:30 +02:00 • committed by GitHub
parent 637b8e260b
commit b496fabf62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
telegram/ext/_application.py
View file

@ -1086,8 +1086,9 @@ class Application(Generic[BT, CCT, UD, CD, BD, JQ], AsyncContextManager["Applica
loop.run_until_complete(self.updater.stop()) # type: ignore[union-attr] loop.run_until_complete(self.updater.stop()) # type: ignore[union-attr]
if self.running: if self.running:
loop.run_until_complete(self.stop()) loop.run_until_complete(self.stop())
if self.post_stop: # post_stop should be called only if stop was called!
loop.run_until_complete(self.post_stop(self)) if self.post_stop:
loop.run_until_complete(self.post_stop(self))
loop.run_until_complete(self.shutdown()) loop.run_until_complete(self.shutdown())
if self.post_shutdown: if self.post_shutdown:
loop.run_until_complete(self.post_shutdown(self)) loop.run_until_complete(self.post_shutdown(self))

8
telegram/ext/_applicationbuilder.py
View file

@ -1334,7 +1334,13 @@ class ApplicationBuilder(Generic[BT, CCT, UD, CD, BD, JQ]):
Tip: Tip:
This can be used for custom stop logic that requires to await coroutines, e.g. This can be used for custom stop logic that requires to await coroutines, e.g.
sending message to a chat before shutting down the bot sending message to a chat before shutting down the bot.
Hint:
The callback will be called only, if :meth:`Application.stop` was indeed called
successfully. For example, if the application is stopped early by calling
:meth:`Application.stop_running` within :meth:`post_init`, then the set callback will
*not* be called.
Example: Example:
.. code:: .. code::

4
tests/ext/test_application.py
View file

@ -2134,7 +2134,6 @@ class TestApplication:
"app_initialize", "app_initialize",
"updater_initialize", "updater_initialize",
"app_shutdown", "app_shutdown",
"post_stop",
"post_shutdown", "post_shutdown",
"updater_shutdown", "updater_shutdown",
} }
@ -2441,7 +2440,8 @@ class TestApplication:
app.run_polling(close_loop=False) app.run_polling(close_loop=False)
# The important part here is that start(_polling) are *not* called! # The important part here is that start(_polling) are *not* called!
assert called_callbacks == ["post_stop", "post_shutdown"] # post_stop must not be called either, since we never called stop()
assert called_callbacks == ["post_shutdown"]
assert len(caplog.records) == 1 assert len(caplog.records) == 1
assert caplog.records[-1].name == "telegram.ext.Application" assert caplog.records[-1].name == "telegram.ext.Application"