Minor refactoring:

- removed remaining assertions
- quotes replaced with double quotes in f-strings
This commit is contained in:
Suren Khorenyan 2018-02-12 22:06:05 +03:00
parent 5a905abe87
commit 70fb332fd3
5 changed files with 9 additions and 7 deletions

View file

@ -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()}")

View file

@ -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')

View file

@ -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!')

View file

@ -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

View file

@ -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}",