From 6de53dd476e0c0f76e470f702c0a3d7fb90e6fd3 Mon Sep 17 00:00:00 2001 From: birdi Date: Sat, 24 Aug 2019 16:14:49 +0300 Subject: [PATCH 1/2] Fix stacklevel arguments in renamed arguments in the dispatcher --- aiogram/dispatcher/dispatcher.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aiogram/dispatcher/dispatcher.py b/aiogram/dispatcher/dispatcher.py index 6891f8be..c12ece20 100644 --- a/aiogram/dispatcher/dispatcher.py +++ b/aiogram/dispatcher/dispatcher.py @@ -915,7 +915,7 @@ class Dispatcher(DataMixin, ContextInstanceMixin): return FSMContext(storage=self.storage, chat=chat, user=user) - @renamed_argument(old_name='user', new_name='user_id', until_version='3.0', stacklevel=4) + @renamed_argument(old_name='user', new_name='user_id', until_version='3.0', stacklevel=3) @renamed_argument(old_name='chat', new_name='chat_id', until_version='3.0', stacklevel=4) async def throttle(self, key, *, rate=None, user_id=None, chat_id=None, no_error=None) -> bool: """ @@ -975,7 +975,7 @@ class Dispatcher(DataMixin, ContextInstanceMixin): return result @renamed_argument('user', 'user_id', '3.0') - @renamed_argument('chat', 'chat_id', '3.0') + @renamed_argument('chat', 'chat_id', '3.0', stacklevel=4) async def check_key(self, key, chat_id=None, user_id=None): """ Get information about key in bucket @@ -997,7 +997,7 @@ class Dispatcher(DataMixin, ContextInstanceMixin): return Throttled(key=key, chat=chat_id, user=user_id, **data) @renamed_argument('user', 'user_id', '3.0') - @renamed_argument('chat', 'chat_id', '3.0') + @renamed_argument('chat', 'chat_id', '3.0', stacklevel=4) async def release_key(self, key, chat_id=None, user_id=None): """ Release blocked key From 21127c3a7b2bf37ab5280140670f92803a0d1765 Mon Sep 17 00:00:00 2001 From: birdi Date: Sat, 24 Aug 2019 16:23:17 +0300 Subject: [PATCH 2/2] Replace positional args with kwargs --- aiogram/dispatcher/dispatcher.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aiogram/dispatcher/dispatcher.py b/aiogram/dispatcher/dispatcher.py index c12ece20..6d16a005 100644 --- a/aiogram/dispatcher/dispatcher.py +++ b/aiogram/dispatcher/dispatcher.py @@ -974,8 +974,8 @@ class Dispatcher(DataMixin, ContextInstanceMixin): raise Throttled(key=key, chat=chat_id, user=user_id, **data) return result - @renamed_argument('user', 'user_id', '3.0') - @renamed_argument('chat', 'chat_id', '3.0', stacklevel=4) + @renamed_argument(old_name='user', new_name='user_id', until_version='3.0', stacklevel=3) + @renamed_argument(old_name='chat', new_name='chat_id', until_version='3.0', stacklevel=4) async def check_key(self, key, chat_id=None, user_id=None): """ Get information about key in bucket @@ -996,8 +996,8 @@ class Dispatcher(DataMixin, ContextInstanceMixin): data = bucket.get(key, {}) return Throttled(key=key, chat=chat_id, user=user_id, **data) - @renamed_argument('user', 'user_id', '3.0') - @renamed_argument('chat', 'chat_id', '3.0', stacklevel=4) + @renamed_argument(old_name='user', new_name='user_id', until_version='3.0', stacklevel=3) + @renamed_argument(old_name='chat', new_name='chat_id', until_version='3.0', stacklevel=4) async def release_key(self, key, chat_id=None, user_id=None): """ Release blocked key