From 0295aed615931b1fad931996209d4e5ffb42988f Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Sun, 10 Dec 2017 02:40:59 +0200 Subject: [PATCH] Relative imports and reformat code (auto) --- aiogram/__init__.py | 2 +- aiogram/bot/bot.py | 3 ++- aiogram/dispatcher/__init__.py | 2 +- aiogram/dispatcher/filters.py | 11 +++++++++++ aiogram/types/chat.py | 2 +- aiogram/types/chat_member.py | 2 +- aiogram/types/input_media.py | 1 + aiogram/types/pre_checkout_query.py | 2 +- 8 files changed, 19 insertions(+), 6 deletions(-) diff --git a/aiogram/__init__.py b/aiogram/__init__.py index 5c41b3fa..e26e6ac7 100644 --- a/aiogram/__init__.py +++ b/aiogram/__init__.py @@ -16,8 +16,8 @@ except ImportError: pass else: import asyncio - asyncio.set_event_loop_policy(uvloop.EventLoopPolicy()) + asyncio.set_event_loop_policy(uvloop.EventLoopPolicy()) VERSION = Version(1, 0, 3, stage=Stage.DEV, build=0) API_VERSION = Version(3, 5) diff --git a/aiogram/bot/bot.py b/aiogram/bot/bot.py index 792d8bfa..bdc38f94 100644 --- a/aiogram/bot/bot.py +++ b/aiogram/bot/bot.py @@ -31,7 +31,8 @@ class Bot(BaseBot): delattr(self, '_me') async def download_file_by_id(self, file_id: base.String, destination=None, - timeout: base.Integer=30, chunk_size: base.Integer=65536, seek: base.Boolean=True): + timeout: base.Integer = 30, chunk_size: base.Integer = 65536, + seek: base.Boolean = True): """ Download file by file_id to destination diff --git a/aiogram/dispatcher/__init__.py b/aiogram/dispatcher/__init__.py index 258dcb95..b69b2e36 100644 --- a/aiogram/dispatcher/__init__.py +++ b/aiogram/dispatcher/__init__.py @@ -5,10 +5,10 @@ import logging import time import typing -from aiogram.dispatcher.middlewares import MiddlewareManager from .filters import CommandsFilter, ContentTypeFilter, ExceptionsFilter, RegexpFilter, USER_STATE, \ generate_default_filters from .handler import CancelHandler, Handler, SkipHandler +from .middlewares import MiddlewareManager from .storage import BaseStorage, DELTA, DisabledStorage, EXCEEDED_COUNT, FSMContext, LAST_CALL, RATE_LIMIT, RESULT from .webhook import BaseResponse from ..bot import Bot diff --git a/aiogram/dispatcher/filters.py b/aiogram/dispatcher/filters.py index 175352e4..599b4aef 100644 --- a/aiogram/dispatcher/filters.py +++ b/aiogram/dispatcher/filters.py @@ -47,6 +47,7 @@ class Filter: """ Base class for filters """ + def __call__(self, *args, **kwargs): return self.check(*args, **kwargs) @@ -58,6 +59,7 @@ class AsyncFilter(Filter): """ Base class for asynchronous filters """ + def __aiter__(self): return None @@ -72,6 +74,7 @@ class AnyFilter(AsyncFilter): """ One filter from many """ + def __init__(self, *filters: callable): self.filters = filters @@ -84,6 +87,7 @@ class NotFilter(AsyncFilter): """ Reverse filter """ + def __init__(self, filter_: callable): self.filter = filter_ @@ -95,6 +99,7 @@ class CommandsFilter(AsyncFilter): """ Check commands in message """ + def __init__(self, commands): self.commands = commands @@ -118,6 +123,7 @@ class RegexpFilter(Filter): """ Regexp filter for messages """ + def __init__(self, regexp): self.regexp = re.compile(regexp, flags=re.IGNORECASE | re.MULTILINE) @@ -130,6 +136,7 @@ class ContentTypeFilter(Filter): """ Check message content type """ + def __init__(self, content_types): self.content_types = content_types @@ -142,6 +149,7 @@ class CancelFilter(Filter): """ Find cancel in message text """ + def __init__(self, cancel_set=None): if cancel_set is None: cancel_set = ['/cancel', 'cancel', 'cancel.'] @@ -156,6 +164,7 @@ class StateFilter(AsyncFilter): """ Check user state """ + def __init__(self, dispatcher, state): self.dispatcher = dispatcher self.state = state @@ -182,6 +191,7 @@ class StatesListFilter(StateFilter): """ List of states """ + async def check(self, obj): chat, user = self.get_target(obj) @@ -194,6 +204,7 @@ class ExceptionsFilter(Filter): """ Filter for exceptions """ + def __init__(self, exception): self.exception = exception diff --git a/aiogram/types/chat.py b/aiogram/types/chat.py index 04996f5e..392de77b 100644 --- a/aiogram/types/chat.py +++ b/aiogram/types/chat.py @@ -211,7 +211,7 @@ class ChatActions(helper.Helper): @classmethod async def _do(cls, action: str, sleep=None): - from aiogram.dispatcher.ctx import get_bot, get_chat + from ..dispatcher.ctx import get_bot, get_chat await get_bot().send_chat_action(get_chat(), action) if sleep: await asyncio.sleep(sleep) diff --git a/aiogram/types/chat_member.py b/aiogram/types/chat_member.py index 96be7b76..f445d69a 100644 --- a/aiogram/types/chat_member.py +++ b/aiogram/types/chat_member.py @@ -1,9 +1,9 @@ import datetime -from aiogram.utils import helper from . import base from . import fields from .user import User +from ..utils import helper class ChatMember(base.TelegramObject): diff --git a/aiogram/types/input_media.py b/aiogram/types/input_media.py index 391e6581..12c9e8ca 100644 --- a/aiogram/types/input_media.py +++ b/aiogram/types/input_media.py @@ -76,6 +76,7 @@ class MediaGroup(base.TelegramObject): """ Helper for sending media group """ + def __init__(self, medias: typing.Optional[typing.List[typing.Union[InputMedia, typing.Dict]]] = None): super(MediaGroup, self).__init__() self.media = [] diff --git a/aiogram/types/pre_checkout_query.py b/aiogram/types/pre_checkout_query.py index b9bcbb12..4786ce48 100644 --- a/aiogram/types/pre_checkout_query.py +++ b/aiogram/types/pre_checkout_query.py @@ -31,4 +31,4 @@ class PreCheckoutQuery(base.TelegramObject): def __eq__(self, other): if isinstance(other, type(self)): return other.id == self.id - return self.id == other \ No newline at end of file + return self.id == other