From 672ddb0d699929e48e8c4b680a975b8fc1dafa0a Mon Sep 17 00:00:00 2001
From: JRoot Junior <jroot.junior@gmail.com>
Date: Fri, 4 Jul 2025 03:31:13 +0300
Subject: [PATCH] Refactor imports and clean up redundant code across methods,
 types, and webhook server classes

---
 aiogram/client/bot.py                     | 4 ++--
 aiogram/methods/__init__.py               | 2 +-
 aiogram/methods/edit_message_checklist.py | 6 +-----
 aiogram/methods/send_checklist.py         | 7 +------
 aiogram/types/owned_gift_unique.py        | 2 +-
 aiogram/types/unique_gift_info.py         | 2 +-
 aiogram/webhook/aiohttp_server.py         | 4 ++--
 7 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/aiogram/client/bot.py b/aiogram/client/bot.py
index f2e0b6fb..908a20ba 100644
--- a/aiogram/client/bot.py
+++ b/aiogram/client/bot.py
@@ -58,13 +58,13 @@ from ..methods import (
     EditForumTopic,
     EditGeneralForumTopic,
     EditMessageCaption,
+    EditMessageChecklist,
     EditMessageLiveLocation,
     EditMessageMedia,
     EditMessageReplyMarkup,
     EditMessageText,
     EditStory,
     EditUserStarSubscription,
-    EditMessageChecklist,
     ExportChatInviteLink,
     ForwardMessage,
     ForwardMessages,
@@ -201,8 +201,8 @@ from ..types import (
     InlineKeyboardMarkup,
     InlineQueryResultsButton,
     InlineQueryResultUnion,
-    InputFile,
     InputChecklist,
+    InputFile,
     InputFileUnion,
     InputMediaUnion,
     InputPaidMediaUnion,
diff --git a/aiogram/methods/__init__.py b/aiogram/methods/__init__.py
index e558cef9..c8956c7e 100644
--- a/aiogram/methods/__init__.py
+++ b/aiogram/methods/__init__.py
@@ -33,10 +33,10 @@ from .delete_story import DeleteStory
 from .delete_webhook import DeleteWebhook
 from .edit_chat_invite_link import EditChatInviteLink
 from .edit_chat_subscription_invite_link import EditChatSubscriptionInviteLink
-from .edit_message_checklist import EditMessageChecklist
 from .edit_forum_topic import EditForumTopic
 from .edit_general_forum_topic import EditGeneralForumTopic
 from .edit_message_caption import EditMessageCaption
+from .edit_message_checklist import EditMessageChecklist
 from .edit_message_live_location import EditMessageLiveLocation
 from .edit_message_media import EditMessageMedia
 from .edit_message_reply_markup import EditMessageReplyMarkup
diff --git a/aiogram/methods/edit_message_checklist.py b/aiogram/methods/edit_message_checklist.py
index 5e9b7a09..f1895eef 100644
--- a/aiogram/methods/edit_message_checklist.py
+++ b/aiogram/methods/edit_message_checklist.py
@@ -2,11 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Optional
 
-from ..types import (
-    InlineKeyboardMarkup,
-    InputChecklist,
-    Message,
-)
+from ..types import InlineKeyboardMarkup, InputChecklist, Message
 from .base import TelegramMethod
 
 
diff --git a/aiogram/methods/send_checklist.py b/aiogram/methods/send_checklist.py
index 2e97a7be..1c5c685e 100644
--- a/aiogram/methods/send_checklist.py
+++ b/aiogram/methods/send_checklist.py
@@ -2,12 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Optional
 
-from ..types import (
-    InlineKeyboardMarkup,
-    InputChecklist,
-    Message,
-    ReplyParameters,
-)
+from ..types import InlineKeyboardMarkup, InputChecklist, Message, ReplyParameters
 from .base import TelegramMethod
 
 
diff --git a/aiogram/types/owned_gift_unique.py b/aiogram/types/owned_gift_unique.py
index a01c4838..a3a9bcb2 100644
--- a/aiogram/types/owned_gift_unique.py
+++ b/aiogram/types/owned_gift_unique.py
@@ -3,8 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any, Literal, Optional
 
 from aiogram.enums import OwnedGiftType
-from .custom import DateTime
 
+from .custom import DateTime
 from .owned_gift import OwnedGift
 
 if TYPE_CHECKING:
diff --git a/aiogram/types/unique_gift_info.py b/aiogram/types/unique_gift_info.py
index 579e8fd4..40e935a5 100644
--- a/aiogram/types/unique_gift_info.py
+++ b/aiogram/types/unique_gift_info.py
@@ -2,8 +2,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Optional
 
-from .custom import DateTime
 from .base import TelegramObject
+from .custom import DateTime
 
 if TYPE_CHECKING:
     from .unique_gift import UniqueGift
diff --git a/aiogram/webhook/aiohttp_server.py b/aiogram/webhook/aiohttp_server.py
index 04b61413..56c3ce0d 100644
--- a/aiogram/webhook/aiohttp_server.py
+++ b/aiogram/webhook/aiohttp_server.py
@@ -5,8 +5,8 @@ from asyncio import Transport
 from typing import Any, Awaitable, Callable, Dict, Optional, Set, Tuple, cast
 
 from aiohttp import JsonPayload, MultipartWriter, Payload, web
-from aiohttp.web_app import Application
 from aiohttp.typedefs import Handler
+from aiohttp.web_app import Application
 from aiohttp.web_middlewares import middleware
 
 from aiogram import Bot, Dispatcher, loggers
@@ -111,7 +111,7 @@ class BaseRequestHandler(ABC):
         app.on_shutdown.append(self._handle_close)
         app.router.add_route("POST", path, self.handle, **kwargs)
 
-    async def _handle_close(self, app: Application) -> None:
+    async def _handle_close(self, *a: Any, **kw: Any) -> None:
         await self.close()
 
     @abstractmethod