From 4c46596848945412c8c0e6545de0c3796d37df41 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Sun, 2 Jul 2023 14:23:10 +0300 Subject: [PATCH] Fixed coverage --- aiogram/client/session/middlewares/base.py | 4 +-- aiogram/client/session/middlewares/manager.py | 25 ++++++++----------- aiogram/types/input_file.py | 4 --- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/aiogram/client/session/middlewares/base.py b/aiogram/client/session/middlewares/base.py index 80b94b1a..c5f3e7cf 100644 --- a/aiogram/client/session/middlewares/base.py +++ b/aiogram/client/session/middlewares/base.py @@ -10,7 +10,7 @@ if TYPE_CHECKING: from ...bot import Bot -class NextRequestMiddlewareType(Protocol[TelegramType]): +class NextRequestMiddlewareType(Protocol[TelegramType]): # pragma: no cover async def __call__( self, bot: "Bot", @@ -19,7 +19,7 @@ class NextRequestMiddlewareType(Protocol[TelegramType]): pass -class RequestMiddlewareProtocol(Protocol): +class RequestMiddlewareType(Protocol): # pragma: no cover async def __call__( self, make_request: NextRequestMiddlewareType[TelegramType], diff --git a/aiogram/client/session/middlewares/manager.py b/aiogram/client/session/middlewares/manager.py index df484952..78015309 100644 --- a/aiogram/client/session/middlewares/manager.py +++ b/aiogram/client/session/middlewares/manager.py @@ -5,47 +5,44 @@ from typing import Any, Callable, List, Optional, Sequence, Union, cast, overloa from aiogram.client.session.middlewares.base import ( NextRequestMiddlewareType, - RequestMiddlewareProtocol, + RequestMiddlewareType, ) from aiogram.methods.base import TelegramType -class RequestMiddlewareManager(Sequence[RequestMiddlewareProtocol]): +class RequestMiddlewareManager(Sequence[RequestMiddlewareType]): def __init__(self) -> None: - self._middlewares: List[RequestMiddlewareProtocol] = [] + self._middlewares: List[RequestMiddlewareType] = [] def register( self, - middleware: RequestMiddlewareProtocol, - ) -> RequestMiddlewareProtocol: + middleware: RequestMiddlewareType, + ) -> RequestMiddlewareType: self._middlewares.append(middleware) return middleware - def unregister(self, middleware: RequestMiddlewareProtocol) -> None: + def unregister(self, middleware: RequestMiddlewareType) -> None: self._middlewares.remove(middleware) def __call__( self, - middleware: Optional[RequestMiddlewareProtocol] = None, - ) -> Union[ - Callable[[RequestMiddlewareProtocol], RequestMiddlewareProtocol], - RequestMiddlewareProtocol, - ]: + middleware: Optional[RequestMiddlewareType] = None, + ) -> Union[Callable[[RequestMiddlewareType], RequestMiddlewareType], RequestMiddlewareType,]: if middleware is None: return self.register return self.register(middleware) @overload - def __getitem__(self, item: int) -> RequestMiddlewareProtocol: + def __getitem__(self, item: int) -> RequestMiddlewareType: pass @overload - def __getitem__(self, item: slice) -> Sequence[RequestMiddlewareProtocol]: + def __getitem__(self, item: slice) -> Sequence[RequestMiddlewareType]: pass def __getitem__( self, item: Union[int, slice] - ) -> Union[RequestMiddlewareProtocol, Sequence[RequestMiddlewareProtocol]]: + ) -> Union[RequestMiddlewareType, Sequence[RequestMiddlewareType]]: return self._middlewares[item] def __len__(self) -> int: diff --git a/aiogram/types/input_file.py b/aiogram/types/input_file.py index 8b74fe03..e13c3379 100644 --- a/aiogram/types/input_file.py +++ b/aiogram/types/input_file.py @@ -29,10 +29,6 @@ class InputFile(ABC): self.filename = filename self.chunk_size = chunk_size - @classmethod - def __get_validators__(cls) -> Iterator[None]: - yield None - @abstractmethod async def read(self, chunk_size: int) -> AsyncGenerator[bytes, None]: # pragma: no cover yield b""