diff --git a/examples/multibot.py b/examples/multibot.py index 82fac4a1..d5dbe5fc 100644 --- a/examples/multibot.py +++ b/examples/multibot.py @@ -4,6 +4,7 @@ from os import getenv from typing import Any, Dict, Union from aiohttp import web +from finite_state_machine import form_router from aiogram import Bot, Dispatcher, F, Router from aiogram.client.session.aiohttp import AiohttpSession @@ -18,7 +19,6 @@ from aiogram.webhook.aiohttp_server import ( TokenBasedRequestHandler, setup_application, ) -from finite_state_machine import form_router main_router = Router() diff --git a/tests/conftest.py b/tests/conftest.py index 9054ea00..c757d259 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -23,9 +23,10 @@ DATA_DIR = Path(__file__).parent / "data" CHAT_ID = -42 USER_ID = 42 -skip_message_pattern = "Need \"--{db}\" option with {db} URI to run" +skip_message_pattern = 'Need "--{db}" option with {db} URI to run' invalid_uri_pattern = "Invalid {db} URI {uri!r}: {err}" + def pytest_addoption(parser): parser.addoption("--redis", default=None, help="run tests which require redis connection") parser.addoption("--mongo", default=None, help="run tests which require mongo connection") @@ -51,9 +52,7 @@ async def redis_storage(redis_server): try: parse_redis_url(redis_server) except ValueError as e: - raise UsageError( - invalid_uri_pattern.format(db="redis", uri=redis_server, err=e) - ) + raise UsageError(invalid_uri_pattern.format(db="redis", uri=redis_server, err=e)) storage = RedisStorage.from_url(redis_server) try: await storage.redis.info() @@ -82,9 +81,7 @@ async def mongo_storage(mongo_server): try: parse_mongo_url(mongo_server) except InvalidURI as e: - raise UsageError( - invalid_uri_pattern.format(db="mongo", uri=mongo_server, err=e) - ) + raise UsageError(invalid_uri_pattern.format(db="mongo", uri=mongo_server, err=e)) storage = MongoStorage.from_url(mongo_server) try: await storage._client.server_info()