From 7f04a33a1e6ca5308c0aa8632d73d9c9fc72e19d Mon Sep 17 00:00:00 2001 From: dsodx Date: Tue, 13 Jun 2023 22:34:04 +0300 Subject: [PATCH] Clear `fsm.storage.__init__.py` --- CHANGES/1188.feature.rst | 19 ++++++++++++++++--- aiogram/fsm/__init__.py | 31 ------------------------------- aiogram/fsm/storage/__init__.py | 31 ------------------------------- 3 files changed, 16 insertions(+), 65 deletions(-) diff --git a/CHANGES/1188.feature.rst b/CHANGES/1188.feature.rst index b3a0eaf9..d65a0e21 100644 --- a/CHANGES/1188.feature.rst +++ b/CHANGES/1188.feature.rst @@ -4,12 +4,25 @@ For example use .. code-block:: python - from aiogram.fsm import RedisStorage, FSMContext, State + from aiogram.fsm import FSMContext, StatesGroup, State + from aiogram.fsm import FSMStrategy, apply_strategy + from aiogram.fsm import FSMContextMiddleware instead of .. code-block:: python - from aiogram.fsm.storage.redis import RedisStorage from aiogram.fsm.context import FSMContext - from aiogram.fsm.state import State + from aiogram.fsm.state import State, StatesGroup + from aiogram.fsm.strategy import FSMStrategy, apply_strategy + from aiogram.fsm.middleware import FSMContextMiddleware + +But you should still use + +.. code-block:: python + + from aiogram.fsm.storage.redis import RedisStorage + from aiogram.fsm.storage.memory import MemoryStorage + from aiogram.fsm.storage.base import BaseStorage + +for import storages. diff --git a/aiogram/fsm/__init__.py b/aiogram/fsm/__init__.py index 7a4cd5be..9940dc4e 100644 --- a/aiogram/fsm/__init__.py +++ b/aiogram/fsm/__init__.py @@ -1,40 +1,9 @@ -from contextlib import suppress - from .context import FSMContext from .middleware import FSMContextMiddleware from .state import State, StatesGroup, StatesGroupMeta -from .storage import ( - BaseEventIsolation, - BaseStorage, - DisabledEventIsolation, - MemoryStorage, - MemoryStorageRecord, - SimpleEventIsolation, - StorageKey, -) - -with suppress(ImportError): - from .storage import ( - DefaultKeyBuilder, - KeyBuilder, - RedisEventIsolation, - RedisStorage, - ) - from .strategy import FSMStrategy, apply_strategy __all__ = ( - "StorageKey", - "BaseStorage", - "BaseEventIsolation", - "MemoryStorageRecord", - "MemoryStorage", - "DisabledEventIsolation", - "SimpleEventIsolation", - "KeyBuilder", - "DefaultKeyBuilder", - "RedisStorage", - "RedisEventIsolation", "FSMContext", "State", "StatesGroup", diff --git a/aiogram/fsm/storage/__init__.py b/aiogram/fsm/storage/__init__.py index 372994bf..e69de29b 100644 --- a/aiogram/fsm/storage/__init__.py +++ b/aiogram/fsm/storage/__init__.py @@ -1,31 +0,0 @@ -from .base import BaseEventIsolation, BaseStorage, StorageKey -from .memory import ( - DisabledEventIsolation, - MemoryStorage, - MemoryStorageRecord, - SimpleEventIsolation, -) - -try: - from .redis import DefaultKeyBuilder, KeyBuilder, RedisEventIsolation, RedisStorage -except ModuleNotFoundError: - from aiogram import loggers - - loggers.dispatcher.warning( - msg="NOTE that Redis package should be installed to use RedisStorage" - ) - - -__all__ = ( - "StorageKey", - "BaseStorage", - "BaseEventIsolation", - "MemoryStorageRecord", - "MemoryStorage", - "DisabledEventIsolation", - "SimpleEventIsolation", - "KeyBuilder", - "DefaultKeyBuilder", - "RedisStorage", - "RedisEventIsolation", -)