diff --git a/bot.py b/bot.py index 407db47..2b31aae 100644 --- a/bot.py +++ b/bot.py @@ -1,4 +1,4 @@ -from typing import List +from typing import List, Tuple import aiojobs as aiojobs from aiogram import Bot, Dispatcher @@ -34,7 +34,7 @@ async def init() -> web.Application: logging.setup() scheduler = await aiojobs.create_scheduler() app = web.Application() - subapps: List[str, web.Application] = [ + subapps: List[Tuple[str, web.Application]] = [ ('/tg/webhooks/', web_handlers.tg_updates_app), ] for prefix, subapp in subapps: diff --git a/keyboards/keyboard_utils/schema_generator.py b/keyboards/keyboard_utils/schema_generator.py index ca975a5..69b513a 100644 --- a/keyboards/keyboard_utils/schema_generator.py +++ b/keyboards/keyboard_utils/schema_generator.py @@ -1,12 +1,12 @@ from typing import List, Union -from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup, KeyboardButton, ReplyKeyboardMarkup +from aiogram.types import InlineKeyboardButton, KeyboardButton def create_keyboard_layout( buttons: List[Union[InlineKeyboardButton, KeyboardButton]], count: List[int] -) -> Union[InlineKeyboardMarkup, ReplyKeyboardMarkup]: +) -> List[List[Union[InlineKeyboardButton, KeyboardButton]]]: if sum(count) != len(buttons): raise ValueError('Количество кнопок не совпадает со схемой') tmplist = []