From 5d168b369f57a95d837a3a6139606524b7890785 Mon Sep 17 00:00:00 2001 From: JRoot Junior Date: Fri, 17 Nov 2023 00:30:34 +0200 Subject: [PATCH] Reformat code --- aiogram/dispatcher/router.py | 2 +- aiogram/fsm/scene.py | 1 + examples/quiz_scene.py | 14 ++++++++++---- tests/test_fsm/test_scene.py | 20 ++++++++++---------- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/aiogram/dispatcher/router.py b/aiogram/dispatcher/router.py index 59600663..4dd4284f 100644 --- a/aiogram/dispatcher/router.py +++ b/aiogram/dispatcher/router.py @@ -2,10 +2,10 @@ from __future__ import annotations from typing import Any, Dict, Final, Generator, List, Optional, Set +from ..types import TelegramObject from .event.bases import REJECTED, UNHANDLED from .event.event import EventObserver from .event.telegram import TelegramEventObserver -from ..types import TelegramObject INTERNAL_UPDATE_TYPES: Final[frozenset[str]] = frozenset({"update", "error"}) diff --git a/aiogram/fsm/scene.py b/aiogram/fsm/scene.py index 7305c1c1..02ae2fa3 100644 --- a/aiogram/fsm/scene.py +++ b/aiogram/fsm/scene.py @@ -521,6 +521,7 @@ class SceneWizard: :param kwargs: Additional keyword arguments to pass to the scene. :return: None """ + assert self.scene_config.state is not None, "Scene state is not specified" await self.goto(self.scene_config.state, **kwargs) async def goto(self, scene: Union[Type[Scene], str], **kwargs: Any) -> None: diff --git a/examples/quiz_scene.py b/examples/quiz_scene.py index 30eb71c6..67b8877b 100644 --- a/examples/quiz_scene.py +++ b/examples/quiz_scene.py @@ -4,13 +4,19 @@ from dataclasses import dataclass, field from os import getenv from typing import Any -from aiogram import Router, html, F, Dispatcher, Bot +from aiogram import Bot, Dispatcher, F, Router, html from aiogram.filters import Command from aiogram.fsm.context import FSMContext -from aiogram.fsm.scene import Scene, on, SceneRegistry, ScenesManager +from aiogram.fsm.scene import Scene, SceneRegistry, ScenesManager, on from aiogram.fsm.storage.memory import SimpleEventIsolation -from aiogram.types import Message, KeyboardButton, ReplyKeyboardRemove -from aiogram.utils.formatting import as_section, as_numbered_list, Bold, as_list, as_key_value +from aiogram.types import KeyboardButton, Message, ReplyKeyboardRemove +from aiogram.utils.formatting import ( + Bold, + as_key_value, + as_list, + as_numbered_list, + as_section, +) from aiogram.utils.keyboard import ReplyKeyboardBuilder TOKEN = getenv("BOT_TOKEN") diff --git a/tests/test_fsm/test_scene.py b/tests/test_fsm/test_scene.py index 415d08c1..ff8a39df 100644 --- a/tests/test_fsm/test_scene.py +++ b/tests/test_fsm/test_scene.py @@ -1,25 +1,25 @@ import inspect from datetime import datetime -from unittest.mock import AsyncMock, ANY, patch +from unittest.mock import ANY, AsyncMock, patch import pytest from aiogram import F from aiogram.fsm.context import FSMContext from aiogram.fsm.scene import ( - on, - ObserverMarker, - ObserverDecorator, - After, - SceneAction, - _empty_handler, - SceneWizard, ActionContainer, - SceneHandlerWrapper, + After, + ObserverDecorator, + ObserverMarker, Scene, + SceneAction, + SceneHandlerWrapper, ScenesManager, + SceneWizard, + _empty_handler, + on, ) -from aiogram.types import TelegramObject, Update, Message, Chat +from aiogram.types import Chat, Message, TelegramObject, Update class TestOnMarker: