From 5e7932ca2018767d731668d02d05ba9293921d40 Mon Sep 17 00:00:00 2001 From: Daniil Kovalenko <40635760+WhiteMemory99@users.noreply.github.com> Date: Tue, 9 Aug 2022 23:48:37 +0700 Subject: [PATCH] Fix default lock kwargs in RedisEventIsolation (#972) * Fix default lock kwargs in RedisEventIsolation * Add changelog --- CHANGES/972.bugfix.rst | 1 + aiogram/dispatcher/fsm/storage/redis.py | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 CHANGES/972.bugfix.rst diff --git a/CHANGES/972.bugfix.rst b/CHANGES/972.bugfix.rst new file mode 100644 index 00000000..c59dbbfc --- /dev/null +++ b/CHANGES/972.bugfix.rst @@ -0,0 +1 @@ +Fixed default lock kwargs in RedisEventIsolation. diff --git a/aiogram/dispatcher/fsm/storage/redis.py b/aiogram/dispatcher/fsm/storage/redis.py index 8d839c6c..db1b5a2c 100644 --- a/aiogram/dispatcher/fsm/storage/redis.py +++ b/aiogram/dispatcher/fsm/storage/redis.py @@ -93,7 +93,6 @@ class RedisStorage(BaseStorage): key_builder: Optional[KeyBuilder] = None, state_ttl: Optional[ExpiryT] = None, data_ttl: Optional[ExpiryT] = None, - lock_kwargs: Optional[Dict[str, Any]] = None, ) -> None: """ :param redis: Instance of Redis connection @@ -104,13 +103,10 @@ class RedisStorage(BaseStorage): """ if key_builder is None: key_builder = DefaultKeyBuilder() - if lock_kwargs is None: - lock_kwargs = DEFAULT_REDIS_LOCK_KWARGS self.redis = redis self.key_builder = key_builder self.state_ttl = state_ttl self.data_ttl = data_ttl - self.lock_kwargs = lock_kwargs @classmethod def from_url( @@ -202,9 +198,11 @@ class RedisEventIsolation(BaseEventIsolation): ) -> None: if key_builder is None: key_builder = DefaultKeyBuilder() + if lock_kwargs is None: + lock_kwargs = DEFAULT_REDIS_LOCK_KWARGS self.redis = redis self.key_builder = key_builder - self.lock_kwargs = lock_kwargs or {} + self.lock_kwargs = lock_kwargs @classmethod def from_url(