From 333f376ad1f81a55e3f760411f2917e6960412c2 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Tue, 4 Jul 2023 00:33:57 +0300 Subject: [PATCH] Fixed pydantic deprecation warnings --- aiogram/filters/callback_data.py | 2 +- aiogram/utils/formatting.py | 4 +++- aiogram/webhook/aiohttp_server.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/aiogram/filters/callback_data.py b/aiogram/filters/callback_data.py index 96c8f3af..7a09dedb 100644 --- a/aiogram/filters/callback_data.py +++ b/aiogram/filters/callback_data.py @@ -85,7 +85,7 @@ class CallbackData(BaseModel): :return: valid callback data for Telegram Bot API """ result = [self.__prefix__] - for key, value in self.dict().items(): + for key, value in self.model_dump(mode="json").items(): encoded = self._encode_value(key, value) if self.__separator__ in encoded: raise ValueError( diff --git a/aiogram/utils/formatting.py b/aiogram/utils/formatting.py index 513d27fd..049db003 100644 --- a/aiogram/utils/formatting.py +++ b/aiogram/utils/formatting.py @@ -441,7 +441,9 @@ def _apply_entity(entity: MessageEntity, *nodes: NodeType) -> NodeType: :return: """ node_type = NODE_TYPES.get(entity.type, Text) - return node_type(*nodes, **entity.dict(exclude={"type", "offset", "length"})) + return node_type( + *nodes, **entity.model_dump(exclude={"type", "offset", "length"}, warnings=False) + ) def _unparse_entities( diff --git a/aiogram/webhook/aiohttp_server.py b/aiogram/webhook/aiohttp_server.py index 0bd5b609..f623484f 100644 --- a/aiogram/webhook/aiohttp_server.py +++ b/aiogram/webhook/aiohttp_server.py @@ -162,7 +162,7 @@ class BaseRequestHandler(ABC): payload.set_content_disposition("form-data", name="method") files: Dict[str, InputFile] = {} - for key, value in result.dict().items(): + for key, value in result.model_dump(warnings=False).items(): value = bot.session.prepare_value(value, bot=bot, files=files) if not value: continue