From 70fb332fd3d37f9d8267f0964686d103d6e9e027 Mon Sep 17 00:00:00 2001 From: Suren Khorenyan Date: Mon, 12 Feb 2018 22:06:05 +0300 Subject: [PATCH] Minor refactoring: - removed remaining assertions - quotes replaced with double quotes in f-strings --- aiogram/bot/base.py | 2 +- aiogram/contrib/fsm_storage/redis.py | 4 ++-- aiogram/dispatcher/middlewares.py | 3 ++- aiogram/utils/versions.py | 3 ++- examples/webhook_example.py | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/aiogram/bot/base.py b/aiogram/bot/base.py index 7bcdd0c9..2aa6816c 100644 --- a/aiogram/bot/base.py +++ b/aiogram/bot/base.py @@ -239,7 +239,7 @@ class BaseBot: setattr(self, '_parse_mode', None) else: if not isinstance(value, str): - raise TypeError(f"Parse mode must be an 'str' not {type(value)}") + raise TypeError(f"Parse mode must be str, not {type(value)}") value = value.lower() if value not in ParseMode.all(): raise ValueError(f"Parse mode must be one of {ParseMode.all()}") diff --git a/aiogram/contrib/fsm_storage/redis.py b/aiogram/contrib/fsm_storage/redis.py index 58d44127..e3103ae3 100644 --- a/aiogram/contrib/fsm_storage/redis.py +++ b/aiogram/contrib/fsm_storage/redis.py @@ -378,9 +378,9 @@ async def migrate_redis1_to_redis2(storage1: RedisStorage, storage2: RedisStorag :return: """ if not isinstance(storage1, RedisStorage): # better than assertion - raise TypeError(f'{type(storage1)} is not RedisStorage instance.') + raise TypeError(f"{type(storage1)} is not RedisStorage instance.") if not isinstance(storage2, RedisStorage): - raise TypeError(f'{type(storage2)} is not RedisStorage instance.') + raise TypeError(f"{type(storage2)} is not RedisStorage instance.") log = logging.getLogger('aiogram.RedisStorage') diff --git a/aiogram/dispatcher/middlewares.py b/aiogram/dispatcher/middlewares.py index 2d8f11a6..4de9d61f 100644 --- a/aiogram/dispatcher/middlewares.py +++ b/aiogram/dispatcher/middlewares.py @@ -28,7 +28,8 @@ class MiddlewareManager: :param middleware: :return: """ - assert isinstance(middleware, BaseMiddleware) + if not isinstance(middleware, BaseMiddleware): + raise TypeError(f"`middleware` must be an instance of BaseMiddleware, not {type(middleware)}") if middleware.is_configured(): raise ValueError('That middleware is already used!') diff --git a/aiogram/utils/versions.py b/aiogram/utils/versions.py index b621bc62..1102a2e9 100644 --- a/aiogram/utils/versions.py +++ b/aiogram/utils/versions.py @@ -24,7 +24,8 @@ class Version: @version.setter def version(self, version): - assert isinstance(version, (tuple, list)) + if not isinstance(version, (tuple, list)): + raise TypeError(f"`version` must be an instance of tuple/list, not {type(version)}") self.__raw_version = version self.__version = None diff --git a/examples/webhook_example.py b/examples/webhook_example.py index 0f5a5e11..eb895ba1 100644 --- a/examples/webhook_example.py +++ b/examples/webhook_example.py @@ -84,12 +84,12 @@ async def cmd_id(message: types.Message): chat = message.chat result_msg = [hbold('Info about user:'), - f'First name: {target.first_name}'] + f"First name: {target.first_name}"] if target.last_name: result_msg.append(f"Last name: {target.last_name}") if target.username: result_msg.append(f"Username: {target.mention}") - result_msg.append(f'User ID: {target.id}') + result_msg.append(f"User ID: {target.id}") result_msg.extend([hbold('Chat:'), f"Type: {chat.type}",