From b37763c23f7fbf64e6e588a963cf0628eaef7a6f Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Sat, 14 Jul 2018 16:28:07 +0300 Subject: [PATCH] Allowed to more simply import base utils from aiogram --- aiogram/__init__.py | 26 ++++++++++++++++++++++++++ aiogram/dispatcher/__init__.py | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/aiogram/__init__.py b/aiogram/__init__.py index 9dbbb13e..0bb6ea26 100644 --- a/aiogram/__init__.py +++ b/aiogram/__init__.py @@ -1,8 +1,16 @@ import asyncio import os +from . import bot +from . import contrib +from . import dispatcher +from . import types +from . import 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 try: import uvloop @@ -12,5 +20,23 @@ else: if 'DISABLE_UVLOOP' not in os.environ: asyncio.set_event_loop_policy(uvloop.EventLoopPolicy()) +__all__ = [ + 'Bot', + 'Dispatcher', + '__api_version__', + '__version__', + 'bot', + 'contrib', + 'dispatcher', + 'exceptions', + 'executor', + 'filters', + 'helper', + 'md', + 'middlewares', + 'types', + 'utils' +] + __version__ = '2.0.dev1' __api_version__ = '3.6' diff --git a/aiogram/dispatcher/__init__.py b/aiogram/dispatcher/__init__.py index 7a2c2dc9..2ff5dc90 100644 --- a/aiogram/dispatcher/__init__.py +++ b/aiogram/dispatcher/__init__.py @@ -3,9 +3,10 @@ from . import handler from . import middlewares from . import storage from . import webhook -from .dispatcher import Dispatcher, dispatcher, FSMContext +from .dispatcher import Dispatcher, dispatcher, FSMContext, DEFAULT_RATE_LIMIT __all__ = [ + 'DEFAULT_RATE_LIMIT', 'Dispatcher', 'dispatcher', 'FSMContext',