mirror of
https://github.com/aiogram/aiogram.git
synced 2026-04-08 16:37:47 +00:00
Remove redundant list() around sorted() and fix router type name in validation error message (#1788)
* Remove redundant list() around sorted() * Fix type name in error message for router type validation * Add changelog
This commit is contained in:
parent
0611d0d953
commit
19a6131618
3 changed files with 7 additions and 4 deletions
1
CHANGES/1788.bugfix.rst
Normal file
1
CHANGES/1788.bugfix.rst
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Remove redundant list() around sorted() and fix router type name in validation error message
|
||||||
|
|
@ -133,7 +133,7 @@ class Router:
|
||||||
Is useful for getting updates only for registered event types.
|
Is useful for getting updates only for registered event types.
|
||||||
|
|
||||||
:param skip_events: skip specified event names
|
:param skip_events: skip specified event names
|
||||||
:return: set of registered names
|
:return: sorted list of registered names
|
||||||
"""
|
"""
|
||||||
handlers_in_use: set[str] = set()
|
handlers_in_use: set[str] = set()
|
||||||
if skip_events is None:
|
if skip_events is None:
|
||||||
|
|
@ -145,7 +145,7 @@ class Router:
|
||||||
if observer.handlers and update_name not in skip_events:
|
if observer.handlers and update_name not in skip_events:
|
||||||
handlers_in_use.add(update_name)
|
handlers_in_use.add(update_name)
|
||||||
|
|
||||||
return list(sorted(handlers_in_use)) # NOQA: C413
|
return sorted(handlers_in_use)
|
||||||
|
|
||||||
async def propagate_event(self, update_type: str, event: TelegramObject, **kwargs: Any) -> Any:
|
async def propagate_event(self, update_type: str, event: TelegramObject, **kwargs: Any) -> Any:
|
||||||
kwargs.update(event_router=self)
|
kwargs.update(event_router=self)
|
||||||
|
|
@ -264,7 +264,7 @@ class Router:
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
if not isinstance(router, Router):
|
if not isinstance(router, Router):
|
||||||
msg = f"router should be instance of Router not {type(router).__class__.__name__}"
|
msg = f"router should be instance of Router not {type(router).__name__!r}"
|
||||||
raise ValueError(msg)
|
raise ValueError(msg)
|
||||||
router.parent_router = self
|
router.parent_router = self
|
||||||
return router
|
return router
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,9 @@ class TestRouter:
|
||||||
|
|
||||||
def test_include_router_by_string_bad_type(self):
|
def test_include_router_by_string_bad_type(self):
|
||||||
router = Router()
|
router = Router()
|
||||||
with pytest.raises(ValueError, match=r"router should be instance of Router"):
|
with pytest.raises(
|
||||||
|
ValueError, match=r"router should be instance of Router not 'TestRouter'"
|
||||||
|
):
|
||||||
router.include_router(self)
|
router.include_router(self)
|
||||||
|
|
||||||
def test_set_parent_router_bad_type(self):
|
def test_set_parent_router_bad_type(self):
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue