Rename handler -> handlers

aiogram/__init__.py

@@ -1,6 +1,5 @@
 from aiogram.dispatcher.flags import FlagGenerator
 
-from . import filters, handler
 from .client import session
 from .client.bot import Bot
 from .dispatcher.dispatcher import Dispatcher
@@ -32,8 +31,6 @@ __all__ = (
     "Dispatcher",
     "Router",
     "BaseMiddleware",
-    "filters",
-    "handler",
     "F",
     "html",
     "md",

aiogram/dispatcher/event/handler.py

@@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple
 from magic_filter import MagicFilter
 
 from aiogram.dispatcher.flags import extract_flags_from_object
-from aiogram.handler import BaseHandler
+from aiogram.handlers import BaseHandler
 
 CallbackType = Callable[..., Any]
 

aiogram/handlers/callback_query.py

@@ -1,7 +1,7 @@
 from abc import ABC
 from typing import Optional
 
-from aiogram.handler import BaseHandler
+from aiogram.handlers import BaseHandler
 from aiogram.types import CallbackQuery, Message, User
 
 

aiogram/handlers/chat_member.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from aiogram.handler import BaseHandler
+from aiogram.handlers import BaseHandler
 from aiogram.types import ChatMemberUpdated, User
 
 

aiogram/handlers/chosen_inline_result.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from aiogram.handler import BaseHandler
+from aiogram.handlers import BaseHandler
 from aiogram.types import ChosenInlineResult, User
 
 

aiogram/handlers/error.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from aiogram.handler.base import BaseHandler
+from aiogram.handlers.base import BaseHandler
 
 
 class ErrorHandler(BaseHandler[Exception], ABC):

aiogram/handlers/inline_query.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from aiogram.handler import BaseHandler
+from aiogram.handlers import BaseHandler
 from aiogram.types import InlineQuery, User
 
 

aiogram/handlers/message.py

@@ -2,7 +2,7 @@ from abc import ABC
 from typing import Optional, cast
 
 from aiogram.filters import CommandObject
-from aiogram.handler.base import BaseHandler, BaseHandlerMixin
+from aiogram.handlers.base import BaseHandler, BaseHandlerMixin
 from aiogram.types import Chat, Message, User
 
 

aiogram/handlers/poll.py

@@ -1,7 +1,7 @@
 from abc import ABC
 from typing import List
 
-from aiogram.handler import BaseHandler
+from aiogram.handlers import BaseHandler
 from aiogram.types import Poll, PollOption
 
 

aiogram/handlers/pre_checkout_query.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from aiogram.handler import BaseHandler
+from aiogram.handlers import BaseHandler
 from aiogram.types import PreCheckoutQuery, User
 
 

aiogram/handlers/shipping_query.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from aiogram.handler import BaseHandler
+from aiogram.handlers import BaseHandler
 from aiogram.types import ShippingQuery, User
 
 

aiogram/utils/text_decorations.py

@@ -14,6 +14,8 @@ __all__ = (
     "TextDecoration",
     "html_decoration",
     "markdown_decoration",
+    "add_surrogates",
+    "remove_surrogates",
 )
 
 

tests/test_dispatcher/test_event/test_handler.py

@@ -6,7 +6,7 @@ import pytest
 from aiogram import F
 from aiogram.dispatcher.event.handler import CallableMixin, FilterObject, HandlerObject
 from aiogram.filters import BaseFilter
-from aiogram.handler import BaseHandler
+from aiogram.handlers import BaseHandler
 from aiogram.types import Update
 
 pytestmark = pytest.mark.asyncio

tests/test_handler/test_base.py

@@ -7,7 +7,7 @@ import pytest
 
 from aiogram import Bot
 from aiogram.dispatcher.event.handler import HandlerObject
-from aiogram.handler import BaseHandler
+from aiogram.handlers import BaseHandler
 from aiogram.types import Chat, Message, Update
 
 pytestmark = pytest.mark.asyncio

tests/test_handler/test_callback_query.py

@@ -2,7 +2,7 @@ from typing import Any
 
 import pytest
 
-from aiogram.handler import CallbackQueryHandler
+from aiogram.handlers import CallbackQueryHandler
 from aiogram.types import CallbackQuery, User
 
 pytestmark = pytest.mark.asyncio

tests/test_handler/test_chat_member.py

@@ -3,7 +3,7 @@ from typing import Any
 
 import pytest
 
-from aiogram.handler import ChatMemberHandler
+from aiogram.handlers import ChatMemberHandler
 from aiogram.types import Chat, ChatMemberMember, ChatMemberUpdated, User
 
 pytestmark = pytest.mark.asyncio

tests/test_handler/test_chosen_inline_result.py

@@ -2,7 +2,7 @@ from typing import Any
 
 import pytest
 
-from aiogram.handler import ChosenInlineResultHandler
+from aiogram.handlers import ChosenInlineResultHandler
 from aiogram.types import ChosenInlineResult, User
 
 pytestmark = pytest.mark.asyncio

tests/test_handler/test_error.py

@@ -2,7 +2,7 @@ from typing import Any
 
 import pytest
 
-from aiogram.handler import ErrorHandler
+from aiogram.handlers import ErrorHandler
 
 pytestmark = pytest.mark.asyncio
 

tests/test_handler/test_inline_query.py

@@ -2,7 +2,7 @@ from typing import Any
 
 import pytest
 
-from aiogram.handler import InlineQueryHandler
+from aiogram.handlers import InlineQueryHandler
 from aiogram.types import InlineQuery, User
 
 pytestmark = pytest.mark.asyncio

tests/test_handler/test_message.py

@@ -4,7 +4,7 @@ from typing import Any
 import pytest
 
 from aiogram.filters import CommandObject
-from aiogram.handler import MessageHandler, MessageHandlerCommandMixin
+from aiogram.handlers import MessageHandler, MessageHandlerCommandMixin
 from aiogram.types import Chat, Message, User
 
 pytestmark = pytest.mark.asyncio

tests/test_handler/test_poll.py

@@ -2,7 +2,7 @@ from typing import Any
 
 import pytest
 
-from aiogram.handler import PollHandler
+from aiogram.handlers import PollHandler
 from aiogram.types import Poll, PollOption
 
 pytestmark = pytest.mark.asyncio

tests/test_handler/test_pre_checkout_query.py

@@ -2,7 +2,7 @@ from typing import Any
 
 import pytest
 
-from aiogram.handler import PreCheckoutQueryHandler
+from aiogram.handlers import PreCheckoutQueryHandler
 from aiogram.types import PreCheckoutQuery, User
 
 pytestmark = pytest.mark.asyncio

tests/test_handler/test_shipping_query.py

@@ -2,7 +2,7 @@ from typing import Any
 
 import pytest
 
-from aiogram.handler import ShippingQueryHandler
+from aiogram.handlers import ShippingQueryHandler
 from aiogram.types import ShippingAddress, ShippingQuery, User
 
 pytestmark = pytest.mark.asyncio