sort imports

aiogram/__init__.py

@@ -1,4 +1,5 @@
 import sys
+
 if sys.version_info < (3, 7):
     raise ImportError('Your Python version {0} is not supported by aiogram, please install '
                       'Python 3.7+'.format('.'.join(map(str, sys.version_info[:3]))))
@@ -6,16 +7,11 @@ if sys.version_info < (3, 7):
 import asyncio
 import os
 
-from . import bot
-from . import contrib
-from . import dispatcher
-from . import types
-from . import utils
+from . import bot, contrib, dispatcher, types, utils
 from .bot import Bot
-from .dispatcher import Dispatcher
-from .dispatcher import filters
-from .dispatcher import middlewares
-from .utils import exceptions, executor, helper, markdown as md
+from .dispatcher import Dispatcher, filters, middlewares
+from .utils import exceptions, executor, helper
+from .utils import markdown as md
 
 try:
     import uvloop

aiogram/bot/base.py

@@ -5,18 +5,18 @@ import ssl
 import typing
 import warnings
 from contextvars import ContextVar
-from typing import Dict, List, Optional, Union, Type
+from typing import Dict, List, Optional, Type, Union
 
 import aiohttp
 import certifi
 from aiohttp.helpers import sentinel
 
-from . import api
-from .api import TelegramAPIServer, TELEGRAM_PRODUCTION
 from ..types import ParseMode, base
 from ..utils import json
 from ..utils.auth_widget import check_integrity
 from ..utils.deprecated import deprecated
+from . import api
+from .api import TELEGRAM_PRODUCTION, TelegramAPIServer
 
 
 class BaseBot:

aiogram/bot/bot.py

@@ -4,13 +4,14 @@ import datetime
 import typing
 import warnings
 
-from .base import BaseBot, api
 from .. import types
 from ..types import base
 from ..utils.deprecated import deprecated
 from ..utils.exceptions import ValidationError
-from ..utils.mixins import DataMixin, ContextInstanceMixin
-from ..utils.payload import generate_payload, prepare_arg, prepare_attachment, prepare_file
+from ..utils.mixins import ContextInstanceMixin, DataMixin
+from ..utils.payload import (
+    generate_payload, prepare_arg, prepare_attachment, prepare_file)
+from .base import BaseBot, api
 
 
 class Bot(BaseBot, DataMixin, ContextInstanceMixin):

aiogram/contrib/fsm_storage/mongo.py

@@ -3,12 +3,11 @@ This module has mongo storage for finite-state machine
     based on `motor <https://github.com/mongodb/motor>`_ driver
 """
 
-from typing import Union, Dict, Optional, List, Tuple, AnyStr
-
+from typing import AnyStr, Dict, List, Optional, Tuple, Union
 
 try:
-    import pymongo
     import motor
+    import pymongo
     from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorDatabase
 except ModuleNotFoundError as e:
     import warnings

aiogram/contrib/middlewares/logging.py

@@ -1,6 +1,5 @@
-import time
-
 import logging
+import time
 
 from aiogram import types
 from aiogram.dispatcher.middlewares import BaseMiddleware

aiogram/dispatcher/__init__.py

@@ -1,9 +1,5 @@
-from . import filters
-from . import handler
-from . import middlewares
-from . import storage
-from . import webhook
-from .dispatcher import Dispatcher, FSMContext, DEFAULT_RATE_LIMIT
+from . import filters, handler, middlewares, storage, webhook
+from .dispatcher import DEFAULT_RATE_LIMIT, Dispatcher, FSMContext
 
 __all__ = (
     'DEFAULT_RATE_LIMIT',

aiogram/dispatcher/dispatcher.py

@@ -9,18 +9,21 @@ import aiohttp
 from aiohttp.helpers import sentinel
 
 from aiogram.utils.deprecated import renamed_argument
-from .filters import Command, ContentTypeFilter, ExceptionsFilter, FiltersFactory, HashTag, Regexp, \
-    RegexpCommandsFilter, StateFilter, Text, IDFilter, AdminFilter, IsReplyFilter, ForwardedMessageFilter, \
-    IsSenderContact, ChatTypeFilter, AbstractFilter
-from .handler import Handler
-from .middlewares import MiddlewareManager
-from .storage import BaseStorage, DELTA, DisabledStorage, EXCEEDED_COUNT, FSMContext, \
-    LAST_CALL, RATE_LIMIT, RESULT
-from .webhook import BaseResponse
+
 from .. import types
 from ..bot import Bot
 from ..utils.exceptions import TelegramAPIError, Throttled
 from ..utils.mixins import ContextInstanceMixin, DataMixin
+from .filters import (
+    AbstractFilter, AdminFilter, ChatTypeFilter, Command, ContentTypeFilter,
+    ExceptionsFilter, FiltersFactory, ForwardedMessageFilter, HashTag,
+    IDFilter, IsReplyFilter, IsSenderContact, Regexp, RegexpCommandsFilter,
+    StateFilter, Text)
+from .handler import Handler
+from .middlewares import MiddlewareManager
+from .storage import (DELTA, EXCEEDED_COUNT, LAST_CALL, RATE_LIMIT, RESULT,
+                      BaseStorage, DisabledStorage, FSMContext)
+from .webhook import BaseResponse
 
 log = logging.getLogger(__name__)
 

aiogram/dispatcher/filters/__init__.py

@@ -1,10 +1,12 @@
-from .builtin import Command, CommandHelp, CommandPrivacy, CommandSettings, CommandStart, ContentTypeFilter, \
-    ExceptionsFilter, HashTag, Regexp, RegexpCommandsFilter, StateFilter, \
-    Text, IDFilter, AdminFilter, IsReplyFilter, IsSenderContact, ForwardedMessageFilter, \
-    ChatTypeFilter
+from .builtin import (
+    AdminFilter, ChatTypeFilter, Command, CommandHelp, CommandPrivacy,
+    CommandSettings, CommandStart, ContentTypeFilter, ExceptionsFilter,
+    ForwardedMessageFilter, HashTag, IDFilter, IsReplyFilter, IsSenderContact,
+    Regexp, RegexpCommandsFilter, StateFilter, Text)
 from .factory import FiltersFactory
-from .filters import AbstractFilter, BoundFilter, Filter, FilterNotPassed, FilterRecord, execute_filter, \
-    check_filters, get_filter_spec, get_filters_spec
+from .filters import (AbstractFilter, BoundFilter, Filter, FilterNotPassed,
+                      FilterRecord, check_filters, execute_filter,
+                      get_filter_spec, get_filters_spec)
 
 __all__ = (
     'Command',

aiogram/dispatcher/filters/factory.py

@@ -1,7 +1,7 @@
 import typing
 
-from .filters import AbstractFilter, FilterRecord
 from ..handler import Handler
+from .filters import AbstractFilter, FilterRecord
 
 
 class FiltersFactory:

aiogram/dispatcher/filters/filters.py

@@ -2,7 +2,7 @@ import abc
 import inspect
 import typing
 
-from ..handler import Handler, FilterObj
+from ..handler import FilterObj, Handler
 
 
 class FilterNotPassed(Exception):

aiogram/dispatcher/handler.py

@@ -1,7 +1,7 @@
 import inspect
 from contextvars import ContextVar
 from dataclasses import dataclass
-from typing import Optional, Iterable, List
+from typing import Iterable, List, Optional
 
 ctx_data = ContextVar('ctx_handler_data')
 current_handler = ContextVar('current_handler')
@@ -88,7 +88,7 @@ class Handler:
         :param args:
         :return:
         """
-        from .filters import check_filters, FilterNotPassed
+        from .filters import FilterNotPassed, check_filters
 
         results = []
 

aiogram/dispatcher/webhook.py

@@ -4,8 +4,8 @@ import datetime
 import functools
 import ipaddress
 import itertools
-import typing
 import logging
+import typing
 from typing import Dict, List, Optional, Union
 
 from aiohttp import web
@@ -15,8 +15,7 @@ from .. import types
 from ..bot import api
 from ..types import ParseMode
 from ..types.base import Boolean, Float, Integer, String
-from ..utils import helper, markdown
-from ..utils import json
+from ..utils import helper, json, markdown
 from ..utils.deprecated import warn_deprecated as warn
 from ..utils.exceptions import TimeoutWarning
 from ..utils.payload import prepare_arg

aiogram/types/__init__.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 from .animation import Animation
 from .audio import Audio
 from .auth_widget_data import AuthWidgetData
@@ -23,17 +22,34 @@ from .game import Game
 from .game_high_score import GameHighScore
 from .inline_keyboard import InlineKeyboardButton, InlineKeyboardMarkup
 from .inline_query import InlineQuery
-from .inline_query_result import InlineQueryResult, InlineQueryResultArticle, InlineQueryResultAudio, \
-    InlineQueryResultCachedAudio, InlineQueryResultCachedDocument, InlineQueryResultCachedGif, \
-    InlineQueryResultCachedMpeg4Gif, InlineQueryResultCachedPhoto, InlineQueryResultCachedSticker, \
-    InlineQueryResultCachedVideo, InlineQueryResultCachedVoice, InlineQueryResultContact, InlineQueryResultDocument, \
-    InlineQueryResultGame, InlineQueryResultGif, InlineQueryResultLocation, InlineQueryResultMpeg4Gif, \
-    InlineQueryResultPhoto, InlineQueryResultVenue, InlineQueryResultVideo, InlineQueryResultVoice
+from .inline_query_result import (InlineQueryResult, InlineQueryResultArticle,
+                                  InlineQueryResultAudio,
+                                  InlineQueryResultCachedAudio,
+                                  InlineQueryResultCachedDocument,
+                                  InlineQueryResultCachedGif,
+                                  InlineQueryResultCachedMpeg4Gif,
+                                  InlineQueryResultCachedPhoto,
+                                  InlineQueryResultCachedSticker,
+                                  InlineQueryResultCachedVideo,
+                                  InlineQueryResultCachedVoice,
+                                  InlineQueryResultContact,
+                                  InlineQueryResultDocument,
+                                  InlineQueryResultGame, InlineQueryResultGif,
+                                  InlineQueryResultLocation,
+                                  InlineQueryResultMpeg4Gif,
+                                  InlineQueryResultPhoto,
+                                  InlineQueryResultVenue,
+                                  InlineQueryResultVideo,
+                                  InlineQueryResultVoice)
 from .input_file import InputFile
-from .input_media import InputMedia, InputMediaAnimation, InputMediaAudio, InputMediaDocument, InputMediaPhoto, \
-    InputMediaVideo, MediaGroup
-from .input_message_content import InputContactMessageContent, InputLocationMessageContent, InputMessageContent, \
-    InputTextMessageContent, InputVenueMessageContent
+from .input_media import (
+    InputMedia, InputMediaAnimation, InputMediaAudio, InputMediaDocument,
+    InputMediaPhoto, InputMediaVideo, MediaGroup)
+from .input_message_content import (InputContactMessageContent,
+                                    InputLocationMessageContent,
+                                    InputMessageContent,
+                                    InputTextMessageContent,
+                                    InputVenueMessageContent)
 from .invoice import Invoice
 from .labeled_price import LabeledPrice
 from .location import Location
@@ -44,15 +60,20 @@ from .message_entity import MessageEntity, MessageEntityType
 from .message_id import MessageId
 from .order_info import OrderInfo
 from .passport_data import PassportData
-from .passport_element_error import PassportElementError, PassportElementErrorDataField, PassportElementErrorFile, \
-    PassportElementErrorFiles, PassportElementErrorFrontSide, PassportElementErrorReverseSide, \
-    PassportElementErrorSelfie
+from .passport_element_error import (PassportElementError,
+                                     PassportElementErrorDataField,
+                                     PassportElementErrorFile,
+                                     PassportElementErrorFiles,
+                                     PassportElementErrorFrontSide,
+                                     PassportElementErrorReverseSide,
+                                     PassportElementErrorSelfie)
 from .passport_file import PassportFile
 from .photo_size import PhotoSize
-from .poll import PollOption, Poll, PollAnswer, PollType
+from .poll import Poll, PollAnswer, PollOption, PollType
 from .pre_checkout_query import PreCheckoutQuery
 from .proximity_alert_triggered import ProximityAlertTriggered
-from .reply_keyboard import KeyboardButton, ReplyKeyboardMarkup, ReplyKeyboardRemove, KeyboardButtonPollType
+from .reply_keyboard import (KeyboardButton, KeyboardButtonPollType,
+                             ReplyKeyboardMarkup, ReplyKeyboardRemove)
 from .response_parameters import ResponseParameters
 from .shipping_address import ShippingAddress
 from .shipping_option import ShippingOption

aiogram/types/animation.py

@@ -1,6 +1,4 @@
-from . import base
-from . import fields
-from . import mixins
+from . import base, fields, mixins
 from .photo_size import PhotoSize
 
 

aiogram/types/audio.py

@@ -1,6 +1,4 @@
-from . import base
-from . import fields
-from . import mixins
+from . import base, fields, mixins
 from .photo_size import PhotoSize
 
 

aiogram/types/auth_widget_data.py

@@ -2,8 +2,7 @@ from __future__ import annotations
 
 from aiohttp import web
 
-from . import base
-from . import fields
+from . import base, fields
 
 
 class AuthWidgetData(base.TelegramObject):

aiogram/types/base.py

@@ -6,9 +6,10 @@ from typing import TypeVar
 
 from babel.support import LazyProxy
 
-from .fields import BaseField
 from ..utils import json
 from ..utils.mixins import ContextInstanceMixin
+from .fields import BaseField
+
 if typing.TYPE_CHECKING:
     from ..bot.bot import Bot
 

aiogram/types/bot_command.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class BotCommand(base.TelegramObject):

aiogram/types/callback_query.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .message import Message
 from .user import User
 

aiogram/types/chat.py

@@ -4,14 +4,14 @@ import asyncio
 import datetime
 import typing
 
+from ..utils import helper, markdown
+from ..utils.deprecated import DeprecatedReadOnlyClassVar, deprecated
 from . import base, fields
 from .chat_location import ChatLocation
 from .chat_member import ChatMember
 from .chat_permissions import ChatPermissions
 from .chat_photo import ChatPhoto
 from .input_file import InputFile
-from ..utils import helper, markdown
-from ..utils.deprecated import deprecated, DeprecatedReadOnlyClassVar
 
 
 class Chat(base.TelegramObject):

aiogram/types/chat_location.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 from .location import Location
 
 

aiogram/types/chat_member.py

@@ -1,9 +1,8 @@
 import datetime
 
-from . import base
-from . import fields
-from .user import User
 from ..utils import helper
+from . import base, fields
+from .user import User
 
 
 class ChatMember(base.TelegramObject):

aiogram/types/chat_permissions.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class ChatPermissions(base.TelegramObject):

aiogram/types/chat_photo.py

@@ -1,8 +1,7 @@
 import os
 import pathlib
 
-from . import base
-from . import fields
+from . import base, fields
 
 
 class ChatPhoto(base.TelegramObject):

aiogram/types/chosen_inline_result.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 from .location import Location
 from .user import User
 

aiogram/types/contact.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class Contact(base.TelegramObject):

aiogram/types/document.py

@@ -1,6 +1,4 @@
-from . import base
-from . import fields
-from . import mixins
+from . import base, fields, mixins
 from .photo_size import PhotoSize
 
 

aiogram/types/encrypted_credentials.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class EncryptedCredentials(base.TelegramObject):

aiogram/types/encrypted_passport_element.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .passport_file import PassportFile
 
 

aiogram/types/file.py

@@ -1,6 +1,4 @@
-from . import base
-from . import fields
-from . import mixins
+from . import base, fields, mixins
 
 
 class File(base.TelegramObject, mixins.Downloadable):

aiogram/types/force_reply.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 
 
 class ForceReply(base.TelegramObject):

aiogram/types/game.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .animation import Animation
 from .message_entity import MessageEntity
 from .photo_size import PhotoSize

aiogram/types/game_high_score.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 from .user import User
 
 

aiogram/types/inline_keyboard.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .callback_game import CallbackGame
 from .login_url import LoginUrl
 

aiogram/types/inline_query.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .inline_query_result import InlineQueryResult
 from .location import Location
 from .user import User

aiogram/types/inline_query_result.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .inline_keyboard import InlineKeyboardMarkup
 from .input_message_content import InputMessageContent
 from .message_entity import MessageEntity

aiogram/types/input_file.py

@@ -9,8 +9,8 @@ from typing import Union
 
 import aiohttp
 
-from . import base
 from ..bot import api
+from . import base
 
 CHUNK_SIZE = 65536
 

aiogram/types/input_media.py

@@ -2,8 +2,7 @@ import io
 import secrets
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .input_file import InputFile
 from .message_entity import MessageEntity
 

aiogram/types/input_message_content.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .message_entity import MessageEntity
 
 

aiogram/types/invoice.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class Invoice(base.TelegramObject):

aiogram/types/labeled_price.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class LabeledPrice(base.TelegramObject):

aiogram/types/location.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 
 
 class Location(base.TelegramObject):

aiogram/types/login_url.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class LoginUrl(base.TelegramObject):

aiogram/types/mask_position.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class MaskPosition(base.TelegramObject):

aiogram/types/order_info.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 from .shipping_address import ShippingAddress
 
 

aiogram/types/passport_data.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .encrypted_credentials import EncryptedCredentials
 from .encrypted_passport_element import EncryptedPassportElement
 

aiogram/types/passport_element_error.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 
 
 class PassportElementError(base.TelegramObject):

aiogram/types/passport_file.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class PassportFile(base.TelegramObject):

aiogram/types/photo_size.py

@@ -1,6 +1,4 @@
-from . import base
-from . import fields
-from . import mixins
+from . import base, fields, mixins
 
 
 class PhotoSize(base.TelegramObject, mixins.Downloadable):

aiogram/types/poll.py

@@ -1,11 +1,11 @@
 import datetime
 import typing
 
+from ..utils import helper
+from ..utils.text_decorations import html_decoration, markdown_decoration
 from . import base, fields
 from .message_entity import MessageEntity
 from .user import User
-from ..utils import helper
-from ..utils.text_decorations import html_decoration, markdown_decoration
 
 
 class PollOption(base.TelegramObject):

aiogram/types/pre_checkout_query.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 from .order_info import OrderInfo
 from .user import User
 

aiogram/types/proximity_alert_triggered.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 from .user import User
 
 

aiogram/types/reply_keyboard.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 
 
 class KeyboardButtonPollType(base.TelegramObject):

aiogram/types/response_parameters.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class ResponseParameters(base.TelegramObject):

aiogram/types/shipping_address.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 
 
 class ShippingAddress(base.TelegramObject):

aiogram/types/shipping_option.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .labeled_price import LabeledPrice
 
 

aiogram/types/shipping_query.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 from .shipping_address import ShippingAddress
 from .user import User
 

aiogram/types/sticker.py

@@ -1,6 +1,4 @@
-from . import base
-from . import fields
-from . import mixins
+from . import base, fields, mixins
 from .mask_position import MaskPosition
 from .photo_size import PhotoSize
 

aiogram/types/sticker_set.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .photo_size import PhotoSize
 from .sticker import Sticker
 

aiogram/types/successful_payment.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 from .order_info import OrderInfo
 
 

aiogram/types/update.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from . import base
-from . import fields
+from ..utils import deprecated, helper
+from . import base, fields
 from .callback_query import CallbackQuery
 from .chosen_inline_result import ChosenInlineResult
 from .inline_query import InlineQuery
@@ -9,7 +9,6 @@ from .message import Message
 from .poll import Poll, PollAnswer
 from .pre_checkout_query import PreCheckoutQuery
 from .shipping_query import ShippingQuery
-from ..utils import helper, deprecated
 
 
 class Update(base.TelegramObject):

aiogram/types/user.py

@@ -4,10 +4,9 @@ from typing import Optional
 
 import babel
 
-from . import base
-from . import fields
 from ..utils import markdown
 from ..utils.deprecated import deprecated
+from . import base, fields
 
 
 class User(base.TelegramObject):

aiogram/types/user_profile_photos.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 from .photo_size import PhotoSize
 
 

aiogram/types/venue.py

@@ -1,5 +1,4 @@
-from . import base
-from . import fields
+from . import base, fields
 from .location import Location
 
 

aiogram/types/video.py

@@ -1,6 +1,4 @@
-from . import base
-from . import fields
-from . import mixins
+from . import base, fields, mixins
 from .photo_size import PhotoSize
 
 

aiogram/types/video_note.py

@@ -1,6 +1,4 @@
-from . import base
-from . import fields
-from . import mixins
+from . import base, fields, mixins
 from .photo_size import PhotoSize
 
 

aiogram/types/voice.py

@@ -1,6 +1,4 @@
-from . import base
-from . import fields
-from . import mixins
+from . import base, fields, mixins
 
 
 class Voice(base.TelegramObject, mixins.Downloadable):

aiogram/types/webhook_info.py

@@ -1,7 +1,6 @@
 import typing
 
-from . import base
-from . import fields
+from . import base, fields
 
 
 class WebhookInfo(base.TelegramObject):

aiogram/utils/deprecated.py

@@ -1,8 +1,8 @@
 import asyncio
+import functools
 import inspect
 import warnings
-import functools
-from typing import Callable, Generic, TypeVar, Type, Optional
+from typing import Callable, Generic, Optional, Type, TypeVar
 
 
 def deprecated(reason, stacklevel=2) -> Callable:

aiogram/utils/exceptions.py

@@ -557,7 +557,8 @@ class MigrateToChat(TelegramAPIError):
 
 class Throttled(TelegramAPIError):
     def __init__(self, **kwargs):
-        from ..dispatcher.storage import DELTA, EXCEEDED_COUNT, KEY, LAST_CALL, RATE_LIMIT, RESULT
+        from ..dispatcher.storage import (DELTA, EXCEEDED_COUNT, KEY,
+                                          LAST_CALL, RATE_LIMIT, RESULT)
         self.key = kwargs.pop(KEY, '<None>')
         self.called_at = kwargs.pop(LAST_CALL, time.time())
         self.rate = kwargs.pop(RATE_LIMIT, None)

aiogram/utils/executor.py

@@ -2,7 +2,7 @@ import asyncio
 import datetime
 import functools
 import secrets
-from typing import Callable, Union, Optional, Any
+from typing import Any, Callable, Optional, Union
 from warnings import warn
 
 from aiohttp import web
@@ -10,7 +10,8 @@ from aiohttp.web_app import Application
 
 from ..bot.api import log
 from ..dispatcher.dispatcher import Dispatcher
-from ..dispatcher.webhook import BOT_DISPATCHER_KEY, DEFAULT_ROUTE_NAME, WebhookRequestHandler
+from ..dispatcher.webhook import (BOT_DISPATCHER_KEY, DEFAULT_ROUTE_NAME,
+                                  WebhookRequestHandler)
 
 APP_EXECUTOR_KEY = 'APP_EXECUTOR'
 

aiogram/utils/mixins.py

@@ -1,5 +1,5 @@
 import contextvars
-from typing import TypeVar, Type
+from typing import Type, TypeVar
 
 __all__ = ('DataMixin', 'ContextInstanceMixin')
 

aiogram/utils/payload.py

@@ -4,6 +4,7 @@ import secrets
 from babel.support import LazyProxy
 
 from aiogram import types
+
 from . import json
 
 DEFAULT_FILTER = ['self', 'cls']

examples/admin_filter_example.py

@@ -1,6 +1,6 @@
 import logging
 
-from aiogram import Bot, Dispatcher, types, executor
+from aiogram import Bot, Dispatcher, executor, types
 
 API_TOKEN = 'API_TOKEN_HERE'
 

examples/callback_data_factory.py

@@ -1,7 +1,7 @@
 import logging
 import random
-import uuid
 import typing
+import uuid
 
 from aiogram import Bot, Dispatcher, executor, md, types
 from aiogram.contrib.fsm_storage.memory import MemoryStorage

examples/id_filter_example.py

@@ -1,7 +1,6 @@
 from aiogram import Bot, Dispatcher, executor, types
 from aiogram.dispatcher.handler import SkipHandler
 
-
 API_TOKEN = 'BOT_TOKEN_HERE'
 bot = Bot(token=API_TOKEN)
 dp = Dispatcher(bot)

examples/inline_bot.py

@@ -2,8 +2,8 @@ import hashlib
 import logging
 
 from aiogram import Bot, Dispatcher, executor
-from aiogram.types import InlineQuery, \
-    InputTextMessageContent, InlineQueryResultArticle
+from aiogram.types import (InlineQuery, InlineQueryResultArticle,
+                           InputTextMessageContent)
 
 API_TOKEN = 'BOT_TOKEN_HERE'
 

examples/inline_keyboard_example.py

@@ -6,7 +6,6 @@ import logging
 
 from aiogram import Bot, Dispatcher, executor, types
 
-
 API_TOKEN = 'BOT_TOKEN_HERE'
 
 # Configure logging

examples/media_group.py

@@ -2,7 +2,6 @@ import asyncio
 
 from aiogram import Bot, Dispatcher, executor, filters, types
 
-
 API_TOKEN = 'BOT_TOKEN_HERE'
 
 bot = Bot(token=API_TOKEN)

examples/payments.py

@@ -1,10 +1,8 @@
-from aiogram import Bot
-from aiogram import types
+from aiogram import Bot, types
 from aiogram.dispatcher import Dispatcher
 from aiogram.types.message import ContentTypes
 from aiogram.utils import executor
 
-
 BOT_TOKEN = 'BOT_TOKEN_HERE'
 PAYMENTS_PROVIDER_TOKEN = '123456789:TEST:1422'
 

examples/regexp_commands_filter_example.py

@@ -2,7 +2,6 @@ from aiogram import Bot, types
 from aiogram.dispatcher import Dispatcher, filters
 from aiogram.utils import executor
 
-
 bot = Bot(token='BOT_TOKEN_HERE', parse_mode=types.ParseMode.HTML)
 dp = Dispatcher(bot)
 

examples/regular_keyboard_example.py

@@ -6,7 +6,6 @@ import logging
 
 from aiogram import Bot, Dispatcher, executor, types
 
-
 API_TOKEN = 'BOT_TOKEN_HERE'
 
 # Configure logging

examples/text_filter_example.py

@@ -7,7 +7,6 @@ import logging
 
 from aiogram import Bot, Dispatcher, executor, types
 
-
 API_TOKEN = 'BOT_TOKEN_HERE'
 
 # Configure logging

examples/throttling_example.py

@@ -12,7 +12,6 @@ from aiogram.dispatcher import Dispatcher
 from aiogram.utils.exceptions import Throttled
 from aiogram.utils.executor import start_polling
 
-
 API_TOKEN = 'BOT_TOKEN_HERE'
 
 logging.basicConfig(level=logging.INFO)

examples/webhook_example.py

@@ -6,7 +6,6 @@ from aiogram.dispatcher import Dispatcher
 from aiogram.dispatcher.webhook import SendMessage
 from aiogram.utils.executor import start_webhook
 
-
 API_TOKEN = 'BOT_TOKEN_HERE'
 
 # webhook settings

examples/webhook_example_old.py

@@ -12,9 +12,9 @@ import aiogram
 from aiogram import Bot, types
 from aiogram.contrib.fsm_storage.memory import MemoryStorage
 from aiogram.dispatcher import Dispatcher
-from aiogram.dispatcher.webhook import get_new_configured_app, SendMessage
-from aiogram.types import ChatType, ParseMode, ContentTypes
-from aiogram.utils.markdown import hbold, bold, text, link
+from aiogram.dispatcher.webhook import SendMessage, get_new_configured_app
+from aiogram.types import ChatType, ContentTypes, ParseMode
+from aiogram.utils.markdown import bold, hbold, link, text
 
 TOKEN = 'BOT TOKEN HERE'
 

tests/__init__.py

@@ -27,6 +27,7 @@ class FakeTelegram(aresponses.ResponsesMockServer):
     @staticmethod
     def parse_data(message_data):
         import json
+
         from aiogram.utils.payload import _normalize
 
         _body = '{"ok":true,"result":' + json.dumps(_normalize(message_data)) + '}'

tests/conftest.py

@@ -1,6 +1,6 @@
+import aioredis.util
 import pytest
 from _pytest.config import UsageError
-import aioredis.util
 
 
 def pytest_addoption(parser):

tests/test_bot.py

@@ -1,7 +1,8 @@
 import pytest
 
 from aiogram import Bot, types
-from . import FakeTelegram, TOKEN, BOT_ID
+
+from . import BOT_ID, TOKEN, FakeTelegram
 
 pytestmark = pytest.mark.asyncio
 
@@ -151,7 +152,7 @@ async def test_send_media_group(bot: Bot, event_loop):
 
 async def test_send_location(bot: Bot, event_loop):
     """ sendLocation method test """
-    from .types.dataset import MESSAGE_WITH_LOCATION, LOCATION
+    from .types.dataset import LOCATION, MESSAGE_WITH_LOCATION
     msg = types.Message(**MESSAGE_WITH_LOCATION)
     location = types.Location(**LOCATION)
 
@@ -163,7 +164,7 @@ async def test_send_location(bot: Bot, event_loop):
 
 async def test_edit_message_live_location_by_bot(bot: Bot, event_loop):
     """ editMessageLiveLocation method test """
-    from .types.dataset import MESSAGE_WITH_LOCATION, LOCATION
+    from .types.dataset import LOCATION, MESSAGE_WITH_LOCATION
     msg = types.Message(**MESSAGE_WITH_LOCATION)
     location = types.Location(**LOCATION)
 
@@ -176,7 +177,7 @@ async def test_edit_message_live_location_by_bot(bot: Bot, event_loop):
 
 async def test_edit_message_live_location_by_user(bot: Bot, event_loop):
     """ editMessageLiveLocation method test """
-    from .types.dataset import MESSAGE_WITH_LOCATION, LOCATION
+    from .types.dataset import LOCATION, MESSAGE_WITH_LOCATION
     msg = types.Message(**MESSAGE_WITH_LOCATION)
     location = types.Location(**LOCATION)
 
@@ -212,7 +213,7 @@ async def test_stop_message_live_location_by_user(bot: Bot, event_loop):
 
 async def test_send_venue(bot: Bot, event_loop):
     """ sendVenue method test """
-    from .types.dataset import MESSAGE_WITH_VENUE, VENUE, LOCATION
+    from .types.dataset import LOCATION, MESSAGE_WITH_VENUE, VENUE
     msg = types.Message(**MESSAGE_WITH_VENUE)
     location = types.Location(**LOCATION)
     venue = types.Venue(**VENUE)
@@ -226,7 +227,7 @@ async def test_send_venue(bot: Bot, event_loop):
 
 async def test_send_contact(bot: Bot, event_loop):
     """ sendContact method test """
-    from .types.dataset import MESSAGE_WITH_CONTACT, CONTACT
+    from .types.dataset import CONTACT, MESSAGE_WITH_CONTACT
     msg = types.Message(**MESSAGE_WITH_CONTACT)
     contact = types.Contact(**CONTACT)
 
@@ -259,7 +260,7 @@ async def test_send_chat_action(bot: Bot, event_loop):
 
 async def test_get_user_profile_photo(bot: Bot, event_loop):
     """ getUserProfilePhotos method test """
-    from .types.dataset import USER_PROFILE_PHOTOS, USER
+    from .types.dataset import USER, USER_PROFILE_PHOTOS
     user = types.User(**USER)
 
     async with FakeTelegram(message_data=USER_PROFILE_PHOTOS, loop=event_loop):
@@ -279,7 +280,7 @@ async def test_get_file(bot: Bot, event_loop):
 
 async def test_kick_chat_member(bot: Bot, event_loop):
     """ kickChatMember method test """
-    from .types.dataset import USER, CHAT
+    from .types.dataset import CHAT, USER
     user = types.User(**USER)
     chat = types.Chat(**CHAT)
 
@@ -291,7 +292,7 @@ async def test_kick_chat_member(bot: Bot, event_loop):
 
 async def test_unban_chat_member(bot: Bot, event_loop):
     """ unbanChatMember method test """
-    from .types.dataset import USER, CHAT
+    from .types.dataset import CHAT, USER
     user = types.User(**USER)
     chat = types.Chat(**CHAT)
 
@@ -303,7 +304,7 @@ async def test_unban_chat_member(bot: Bot, event_loop):
 
 async def test_restrict_chat_member(bot: Bot, event_loop):
     """ restrictChatMember method test """
-    from .types.dataset import USER, CHAT
+    from .types.dataset import CHAT, USER
     user = types.User(**USER)
     chat = types.Chat(**CHAT)
 
@@ -323,7 +324,7 @@ async def test_restrict_chat_member(bot: Bot, event_loop):
 
 async def test_promote_chat_member(bot: Bot, event_loop):
     """ promoteChatMember method test """
-    from .types.dataset import USER, CHAT
+    from .types.dataset import CHAT, USER
     user = types.User(**USER)
     chat = types.Chat(**CHAT)
 

tests/test_bot/test_session.py

@@ -7,7 +7,8 @@ from aiogram.bot.base import BaseBot
 try:
     from asynctest import CoroutineMock, patch
 except ImportError:
-    from unittest.mock import AsyncMock as CoroutineMock, patch  # type: ignore
+    from unittest.mock import AsyncMock as CoroutineMock  # type: ignore
+    from unittest.mock import patch
 
 
 class TestAiohttpSession:

tests/test_dispatcher.py

@@ -1,6 +1,6 @@
 import pytest
 
-from aiogram import Dispatcher, Bot
+from aiogram import Bot, Dispatcher
 
 pytestmark = pytest.mark.asyncio
 

tests/test_dispatcher/test_filters/test_builtin.py

@@ -1,13 +1,12 @@
-from typing import Set
 from datetime import datetime
+from typing import Set
 
 import pytest
 
-from aiogram.dispatcher.filters.builtin import (
-    Text,
-    extract_chat_ids,
-    ChatIDArgumentType, ForwardedMessageFilter, IDFilter,
-)
+from aiogram.dispatcher.filters.builtin import (ChatIDArgumentType,
+                                                ForwardedMessageFilter,
+                                                IDFilter, Text,
+                                                extract_chat_ids)
 from aiogram.types import Message
 from tests.types.dataset import MESSAGE, MESSAGE_FROM_CHANNEL
 

tests/test_dispatcher/test_filters/test_state.py

@@ -1,5 +1,6 @@
 from aiogram.dispatcher.filters.state import StatesGroup
 
+
 class TestStatesGroup:
 
     def test_all_childs(self):

tests/test_filters.py

@@ -3,8 +3,8 @@ from typing import Match
 
 import pytest
 
-from aiogram.dispatcher.filters import Text, CommandStart
-from aiogram.types import Message, CallbackQuery, InlineQuery, Poll
+from aiogram.dispatcher.filters import CommandStart, Text
+from aiogram.types import CallbackQuery, InlineQuery, Message, Poll
 
 # enable asyncio mode
 pytestmark = pytest.mark.asyncio

tests/test_message.py

@@ -3,7 +3,8 @@ from asyncio import BaseEventLoop
 import pytest
 
 from aiogram import Bot, types
-from . import FakeTelegram, TOKEN
+
+from . import TOKEN, FakeTelegram
 
 pytestmark = pytest.mark.asyncio
 

tests/test_states_group.py

@@ -1,6 +1,7 @@
 import pytest
 
-from aiogram.dispatcher.filters.state import State, StatesGroup, any_state, default_state
+from aiogram.dispatcher.filters.state import (State, StatesGroup, any_state,
+                                              default_state)
 
 
 class MyGroup(StatesGroup):

tests/test_utils/test_auth_widget.py

@@ -1,7 +1,7 @@
 import pytest
 
-from aiogram.utils.auth_widget import check_integrity, \
-    generate_hash, check_token
+from aiogram.utils.auth_widget import (check_integrity, check_token,
+                                       generate_hash)
 
 TOKEN = '123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11'
 

tests/test_utils/test_deep_linking.py

@@ -1,7 +1,8 @@
 import pytest
 
-from aiogram.utils.deep_linking import decode_payload, encode_payload, filter_payload
-from aiogram.utils.deep_linking import get_start_link, get_startgroup_link
+from aiogram.utils.deep_linking import (decode_payload, encode_payload,
+                                        filter_payload, get_start_link,
+                                        get_startgroup_link)
 from tests.types import dataset
 
 # enable asyncio mode

tests/test_utils/test_helper.py

@@ -1,4 +1,4 @@
-from aiogram.utils.helper import OrderedHelper, Item, ListItem
+from aiogram.utils.helper import Item, ListItem, OrderedHelper
 
 
 class TestOrderedHelper:

tests/types/test_animation.py

@@ -1,4 +1,5 @@
 from aiogram import types
+
 from .dataset import ANIMATION
 
 animation = types.Animation(**ANIMATION)