From f635fe0975641b711ab0978f6d9193e40726990f Mon Sep 17 00:00:00 2001
From: SashaXser <24498484+SashaXser@users.noreply.github.com>
Date: Tue, 19 Dec 2023 18:56:07 +0300
Subject: [PATCH 1/6] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D1=80=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Рефракторинг на основе новых возможностей Python
---
 examples/bot_longpoll.py                   |  13 +--
 examples/get_album_audio.py                |   2 +-
 examples/get_all_audio.py                  |   6 +-
 examples/messages_bot/user_messages_bot.py |   6 +-
 examples/requests_pool.py                  |  14 +--
 examples/upload_photo.py                   |   4 +-
 vk_api/audio.py                            | 122 ++++++---------------
 vk_api/audio_url_decoder.py                |  15 +--
 vk_api/bot_longpoll.py                     |   5 +-
 vk_api/exceptions.py                       |  11 +-
 vk_api/execute.py                          |  24 ++--
 vk_api/keyboard.py                         |   9 +-
 vk_api/longpoll.py                         |  15 +--
 vk_api/requests_pool.py                    |  16 +--
 vk_api/streaming.py                        |   4 +-
 vk_api/tools.py                            |  14 +--
 vk_api/upload.py                           |  19 +---
 vk_api/utils.py                            |   9 +-
 vk_api/vk_api.py                           |  78 +++++--------
 19 files changed, 120 insertions(+), 266 deletions(-)

diff --git a/examples/bot_longpoll.py b/examples/bot_longpoll.py
index 63ae410b..7b50bd95 100644
--- a/examples/bot_longpoll.py
+++ b/examples/bot_longpoll.py
@@ -23,8 +23,6 @@ def main():
             print(event.obj.from_id)
 
             print('Текст:', event.obj.text)
-            print()
-
         elif event.type == VkBotEventType.MESSAGE_REPLY:
             print('Новое сообщение:')
 
@@ -33,8 +31,6 @@ def main():
             print(event.obj.peer_id)
 
             print('Текст:', event.obj.text)
-            print()
-
         elif event.type == VkBotEventType.MESSAGE_TYPING_STATE:
             print('Печатает ', end='')
 
@@ -43,23 +39,18 @@ def main():
             print('для ', end='')
 
             print(event.obj.to_id)
-            print()
-
         elif event.type == VkBotEventType.GROUP_JOIN:
             print(event.obj.user_id, end=' ')
 
             print('Вступил в группу!')
-            print()
-
         elif event.type == VkBotEventType.GROUP_LEAVE:
             print(event.obj.user_id, end=' ')
 
             print('Покинул группу!')
-            print()
-
         else:
             print(event.type)
-            print()
+
+        print()
 
 
 if __name__ == '__main__':
diff --git a/examples/get_album_audio.py b/examples/get_album_audio.py
index 0b11a9e8..5409ad35 100644
--- a/examples/get_album_audio.py
+++ b/examples/get_album_audio.py
@@ -29,7 +29,7 @@ def main():
     tracks = vkaudio.get(album_id=albums[0]['id'])
 
     for n, track in enumerate(tracks, 1):
-        print('{}. {} {}'.format(n, track['title'], track['url']))
+        print(f"{n}. {track['title']} {track['url']}")
 
 
 if __name__ == '__main__':
diff --git a/examples/get_all_audio.py b/examples/get_all_audio.py
index 9f661030..4ed42c2b 100644
--- a/examples/get_all_audio.py
+++ b/examples/get_all_audio.py
@@ -26,17 +26,17 @@ def main():
     # Составляем рейтинг первых 15
     print('Top 15:')
     for artist, tracks in artists.most_common(15):
-        print('{} - {} tracks'.format(artist, tracks))
+        print(f'{artist} - {tracks} tracks')
 
     # Ищем треки самого популярного
     most_common_artist = artists.most_common(1)[0][0]
 
-    print('\nSearching for {}:'.format(most_common_artist))
+    print(f'\nSearching for {most_common_artist}:')
 
     tracks = vkaudio.search(q=most_common_artist, count=10)
 
     for n, track in enumerate(tracks, 1):
-        print('{}. {} {}'.format(n, track['title'], track['url']))
+        print(f"{n}. {track['title']} {track['url']}")
 
 
 if __name__ == '__main__':
diff --git a/examples/messages_bot/user_messages_bot.py b/examples/messages_bot/user_messages_bot.py
index 0493367d..804cde9d 100644
--- a/examples/messages_bot/user_messages_bot.py
+++ b/examples/messages_bot/user_messages_bot.py
@@ -36,7 +36,7 @@ def main():
 
     for event in longpoll.listen():
         if event.type == VkEventType.MESSAGE_NEW and event.to_me and event.text:
-            print('id{}: "{}"'.format(event.user_id, event.text), end=' ')
+            print(f'id{event.user_id}: "{event.text}"', end=' ')
 
             response = session.get(
                 'http://api.duckduckgo.com/',
@@ -64,9 +64,7 @@ def main():
                 image = session.get(image_url, stream=True)
                 photo = upload.photo_messages(photos=image.raw)[0]
 
-                attachments.append(
-                    'photo{}_{}'.format(photo['owner_id'], photo['id'])
-                )
+                attachments.append(f"photo{photo['owner_id']}_{photo['id']}")
 
             vk.messages.send(
                 user_id=event.user_id,
diff --git a/examples/requests_pool.py b/examples/requests_pool.py
index 7a4edd77..d0be98c7 100644
--- a/examples/requests_pool.py
+++ b/examples/requests_pool.py
@@ -66,15 +66,13 @@ def main():
     """Пример использования пула в виде объекта. Такой пул можно
     передать в качестве параметра"""
 
-    friends = {}
-    
     pool = vk_api.VkRequestsPool(vk_session)
-    for user_id in [1, 183433824]:
-        friends[user_id] = pool.method('friends.get', {
-            'user_id': user_id,
-            'fields': 'photo'
-        })
-        
+    friends = {
+        user_id: pool.method(
+            'friends.get', {'user_id': user_id, 'fields': 'photo'}
+        )
+        for user_id in [1, 183433824]
+    }
     pool.execute()
 
     for key, value in friends.items():
diff --git a/examples/upload_photo.py b/examples/upload_photo.py
index b3cc15a0..ee1c8c45 100644
--- a/examples/upload_photo.py
+++ b/examples/upload_photo.py
@@ -25,9 +25,7 @@ def main():
         group_id=74030368
     )
 
-    vk_photo_url = 'https://vk.com/photo{}_{}'.format(
-        photo[0]['owner_id'], photo[0]['id']
-    )
+    vk_photo_url = f"https://vk.com/photo{photo[0]['owner_id']}_{photo[0]['id']}"
 
     print(photo, '\nLink: ', vk_photo_url)
 
diff --git a/vk_api/audio.py b/vk_api/audio.py
index d278edac..86a263c8 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -123,9 +123,7 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
 
             if not response['data'][0]:
                 raise AccessDenied(
-                    'You don\'t have permissions to browse {}\'s albums'.format(
-                        owner_id
-                    )
+                    f"You don\'t have permissions to browse {owner_id}\'s albums"
                 )
 
             ids = scrap_ids(
@@ -134,16 +132,12 @@ def get_iter(self, owner_id=None, album_id=None, access_hash=None):
             if not ids:
                 break
 
-            tracks = scrap_tracks(
+            yield from scrap_tracks(
                 ids,
                 self.user_id,
                 self._vk.http,
-                convert_m3u8_links=self.convert_m3u8_links
+                convert_m3u8_links=self.convert_m3u8_links,
             )
-
-            for i in tracks:
-                yield i
-
             if response['data'][0]['hasMore']:
                 offset += offset_diff
             else:
@@ -172,20 +166,14 @@ def get_albums_iter(self, owner_id=None):
 
         while True:
             response = self._vk.http.get(
-                'https://m.vk.com/audio?act=audio_playlists{}'.format(
-                    owner_id
-                ),
-                params={
-                    'offset': offset
-                },
-                allow_redirects=False
+                f'https://m.vk.com/audio?act=audio_playlists{owner_id}',
+                params={'offset': offset},
+                allow_redirects=False,
             )
 
             if not response.text:
                 raise AccessDenied(
-                    'You don\'t have permissions to browse {}\'s albums'.format(
-                        owner_id
-                    )
+                    f"You don\'t have permissions to browse {owner_id}\'s albums"
                 )
 
             albums = scrap_albums(response.text)
@@ -193,9 +181,7 @@ def get_albums_iter(self, owner_id=None):
             if not albums:
                 break
 
-            for i in albums:
-                yield i
-
+            yield from albums
             offset += ALBUMS_PER_USER_PAGE
 
     def get_albums(self, owner_id=None):
@@ -232,9 +218,7 @@ def search_user(self, owner_id=None, q=''):
 
         if not json_response['payload'][1]:
             raise AccessDenied(
-                'You don\'t have permissions to browse {}\'s audio'.format(
-                    owner_id
-                )
+                f"You don\'t have permissions to browse {owner_id}\'s audio"
             )
 
         if json_response['payload'][1][1]['playlists']:
@@ -356,16 +340,12 @@ def search_iter(self, q, offset=0):
                 if offset_left < offset:
                     ids = ids[offset - offset_left:]
 
-                tracks = scrap_tracks(
+                yield from scrap_tracks(
                     ids,
                     self.user_id,
                     convert_m3u8_links=self.convert_m3u8_links,
-                    http=self._vk.http
+                    http=self._vk.http,
                 )
-
-                for track in tracks:
-                    yield track
-
             offset_left += len(ids)
 
             response = self._vk.http.post(
@@ -404,16 +384,12 @@ def get_updates_iter(self):
             if not ids:
                 break
 
-            tracks = scrap_tracks(
+            yield from scrap_tracks(
                 ids,
                 self.user_id,
                 convert_m3u8_links=self.convert_m3u8_links,
-                http=self._vk.http
+                http=self._vk.http,
             )
-
-            for track in tracks:
-                yield track
-
             if len(updates) < 11:
                 break
 
@@ -447,16 +423,13 @@ def get_popular_iter(self, offset=0):
             json_response['sectionData']['recoms']['playlist']['list']
         )
 
-        tracks = scrap_tracks(
+        yield from scrap_tracks(
             ids[offset:] if offset else ids,
             self.user_id,
             convert_m3u8_links=self.convert_m3u8_links,
-            http=self._vk.http
+            http=self._vk.http,
         )
 
-        for track in tracks:
-            yield track
-
     def get_news_iter(self, offset=0):
         """ Искать популярные аудиозаписи  (генератор)
 
@@ -479,16 +452,12 @@ def get_news_iter(self, offset=0):
         )
 
         if offset_left + len(ids) >= offset:
-            tracks = scrap_tracks(
-                ids if offset_left >= offset else ids[offset - offset_left:],
+            yield from scrap_tracks(
+                ids if offset_left >= offset else ids[offset - offset_left :],
                 self.user_id,
                 convert_m3u8_links=self.convert_m3u8_links,
-                http=self._vk.http
+                http=self._vk.http,
             )
-
-            for track in tracks:
-                yield track
-
         offset_left += len(ids)
 
         while True:
@@ -511,16 +480,12 @@ def get_news_iter(self, offset=0):
                 break
 
             if offset_left + len(ids) >= offset:
-                tracks = scrap_tracks(
-                    ids if offset_left >= offset else ids[offset - offset_left:],
+                yield from scrap_tracks(
+                    ids if offset_left >= offset else ids[offset - offset_left :],
                     self.user_id,
                     convert_m3u8_links=self.convert_m3u8_links,
-                    http=self._vk.http
+                    http=self._vk.http,
                 )
-
-                for track in tracks:
-                    yield track
-
             offset_left += len(ids)
 
     def get_audio_by_id(self, owner_id, audio_id):
@@ -530,8 +495,7 @@ def get_audio_by_id(self, owner_id, audio_id):
         :param audio_id: ID аудио
         """
         response = self._vk.http.get(
-            'https://m.vk.com/audio{}_{}'.format(owner_id, audio_id),
-            allow_redirects=False
+            f'https://m.vk.com/audio{owner_id}_{audio_id}', allow_redirects=False
         )
 
         ids = scrap_ids_from_html(
@@ -539,14 +503,12 @@ def get_audio_by_id(self, owner_id, audio_id):
             filter_root_el={'class': 'basisDefault'}
         )
 
-        track = scrap_tracks(
+        if track := scrap_tracks(
             ids,
             self.user_id,
             http=self._vk.http,
-            convert_m3u8_links=self.convert_m3u8_links
-        )
-
-        if track:
+            convert_m3u8_links=self.convert_m3u8_links,
+        ):
             return next(track)
         else:
             return []
@@ -557,34 +519,26 @@ def get_post_audio(self, owner_id, post_id):
         :param owner_id: ID владельца (отрицательные значения для групп)
         :param post_id: ID поста
         """
-        response = self._vk.http.get(
-            'https://m.vk.com/wall{}_{}'.format(owner_id, post_id)
-        )
+        response = self._vk.http.get(f'https://m.vk.com/wall{owner_id}_{post_id}')
 
         ids = scrap_ids_from_html(
             response.text,
             filter_root_el={'class': 'audios_list'}
         )
 
-        tracks = scrap_tracks(
+        return scrap_tracks(
             ids,
             self.user_id,
             http=self._vk.http,
-            convert_m3u8_links=self.convert_m3u8_links
+            convert_m3u8_links=self.convert_m3u8_links,
         )
 
-        return tracks
-
     def follow_user(self, user_id):
         data = self._vk.http.get(f"https://vk.com/audios{user_id}")
 
         user_hash = RE_USER_AUDIO_HASH.search(data.text)
         if user_hash is None:
-            raise AccessDenied(
-                'You don\'t have permissions to browse {}\'s audio'.format(
-                    user_id
-                )
-            )
+            raise AccessDenied(f"You don\'t have permissions to browse {user_id}\'s audio")
         user_hash = user_hash.groups()[1]
 
         response = self._vk.http.post(
@@ -596,20 +550,14 @@ def follow_user(self, user_id):
                 'hash': user_hash,
             }
         )
-        json_response = json.loads(response.text.replace('<!--', ''))
-
-        return json_response
+        return json.loads(response.text.replace('<!--', ''))
     
     def unfollow_user(self, user_id):
         data = self._vk.http.get(f"https://vk.com/audios{user_id}")
 
         user_hash = RE_USER_AUDIO_HASH.search(data.text)
         if user_hash is None:
-            raise AccessDenied(
-                'You don\'t have permissions to browse {}\'s audio'.format(
-                    user_id
-                )
-            )
+            raise AccessDenied(f"You don\'t have permissions to browse {user_id}\'s audio")
         user_hash = user_hash.groups()[1]
 
         response = self._vk.http.post(
@@ -621,9 +569,7 @@ def unfollow_user(self, user_id):
                 'hash': user_hash,
             }
         )
-        json_response = json.loads(response.text.replace('<!--', ''))
-
-        return json_response
+        return json.loads(response.text.replace('<!--', ''))
 
 
 def scrap_ids(audio_data):
@@ -646,9 +592,7 @@ def scrap_json(html_page):
     """ Парсинг списка хэшей аудиозаписей новинок или популярных + nextFrom&sessionId """
 
     find_json_pattern = r"new AudioPage\(.*?(\{.*\})"
-    fr = re.search(find_json_pattern, html_page).group(1)
-
-    return fr
+    return re.search(find_json_pattern, html_page).group(1)
 
 
 def scrap_ids_from_html(html, filter_root_el=None):
diff --git a/vk_api/audio_url_decoder.py b/vk_api/audio_url_decoder.py
index 2235fc0c..0b5eb34b 100644
--- a/vk_api/audio_url_decoder.py
+++ b/vk_api/audio_url_decoder.py
@@ -29,11 +29,7 @@ def decode_audio_url(string, user_id):
 
         split_op_data = op_data.split('\x0b')
         cmd = split_op_data[0]
-        if len(split_op_data) > 1:
-            arg = split_op_data[1]
-        else:
-            arg = None
-
+        arg = split_op_data[1] if len(split_op_data) > 1 else None
         if cmd == 'v':
             tstr = tstr[::-1]
 
@@ -48,7 +44,7 @@ def decode_audio_url(string, user_id):
             tstr = vk_i(tstr, arg, user_id)
         else:
             raise VkAudioUrlDecodeError(
-                'Unknown decode cmd: "{}"; Please send bugreport'.format(cmd)
+                f'Unknown decode cmd: "{cmd}"; Please send bugreport'
             )
 
     return tstr
@@ -63,15 +59,12 @@ def vk_o(string):
 
         if sym_index != -1:
             if index2 % 4 != 0:
+                index2 += 1
                 i = (i << 6) + sym_index
+                result += [chr(0xFF & i >> (-2 * index2 & 6))]
             else:
                 i = sym_index
 
-            if index2 % 4 != 0:
-                index2 += 1
-                shift = -2 * index2 & 6
-                result += [chr(0xFF & (i >> shift))]
-            else:
                 index2 += 1
 
     return ''.join(result)
diff --git a/vk_api/bot_longpoll.py b/vk_api/bot_longpoll.py
index e3943a10..943e5fb1 100644
--- a/vk_api/bot_longpoll.py
+++ b/vk_api/bot_longpoll.py
@@ -138,7 +138,7 @@ def __init__(self, raw):
         self.group_id = raw['group_id']
 
     def __repr__(self):
-        return '<{}({})>'.format(type(self), self.raw)
+        return f'<{type(self)}({self.raw})>'
 
 
 class VkBotMessageEvent(VkBotEvent):
@@ -283,5 +283,4 @@ def listen(self):
         """
 
         while True:
-            for event in self.check():
-                yield event
+            yield from self.check()
diff --git a/vk_api/exceptions.py b/vk_api/exceptions.py
index 61d2363b..0128c6e7 100644
--- a/vk_api/exceptions.py
+++ b/vk_api/exceptions.py
@@ -57,9 +57,7 @@ def __init__(self, phone_prefix=None, phone_postfix=None, response=None):
 
     def __str__(self):
         if self.phone_prefix and self.phone_postfix:
-            return 'Security check. Enter number: {} ... {}'.format(
-                self.phone_prefix, self.phone_postfix
-            )
+            return f'Security check. Enter number: {self.phone_prefix} ... {self.phone_postfix}'
         else:
             return ('Security check. Phone prefix and postfix are not detected.'
                     ' Please send bugreport (response in self.response)')
@@ -83,8 +81,7 @@ def try_method(self):
         return self.vk.method(self.method, self.values, raw=self.raw)
 
     def __str__(self):
-        return '[{}] {}'.format(self.error['error_code'],
-                                self.error['error_msg'])
+        return f"[{self.error['error_code']}] {self.error['error_msg']}"
 
 
 class ApiHttpError(VkApiError):
@@ -104,7 +101,7 @@ def try_method(self):
         return self.vk.method(self.method, self.values, raw=self.raw)
 
     def __str__(self):
-        return 'Response code {}'.format(self.response.status_code)
+        return f'Response code {self.response.status_code}'
 
 
 class Captcha(VkApiError):
@@ -128,7 +125,7 @@ def get_url(self):
         """ Получить ссылку на изображение капчи """
 
         if not self.url:
-            self.url = 'https://api.vk.com/captcha.php?sid={}'.format(self.sid)
+            self.url = f'https://api.vk.com/captcha.php?sid={self.sid}'
 
         return self.url
 
diff --git a/vk_api/execute.py b/vk_api/execute.py
index 82ca3fd9..3e8c65b8 100644
--- a/vk_api/execute.py
+++ b/vk_api/execute.py
@@ -31,14 +31,10 @@ def __init__(self, code, args=None, clean_args=None, return_raw=False):
         self.return_raw = return_raw
 
     def compile(self, args):
-        compiled_args = {}
-
-        for key, value in args.items():
-            if key in self.clean_args:
-                compiled_args[key] = str(value)
-            else:
-                compiled_args[key] = sjson_dumps(value)
-
+        compiled_args = {
+            key: str(value) if key in self.clean_args else sjson_dumps(value)
+            for key, value in args.items()
+        }
         return self._minified_code % compiled_args
 
     def __call__(self, vk, *args, **kwargs):
@@ -77,20 +73,16 @@ def parse_args(function_args, args, kwargs):
             parsed_args[arg_name] = kwargs[arg_name]
         else:
             raise VkFunctionException(
-                'function got an unexpected keyword argument \'{}\''.format(
-                    arg_name
-                ))
+                f"function got an unexpected keyword argument \'{arg_name}\'"
+            )
 
     args_count = len(args) + len(kwargs)
     func_args_count = len(function_args)
 
     if args_count != func_args_count:
         raise VkFunctionException(
-            'function takes exactly {} argument{} ({} given)'.format(
-                func_args_count,
-                's' if func_args_count > 1 else '',
-                args_count
-            ))
+            f"function takes exactly {func_args_count} argument{'s' if func_args_count > 1 else ''} ({args_count} given)"
+        )
 
     for arg_name, arg_value in zip(function_args, args):
         parsed_args[arg_name] = arg_value
diff --git a/vk_api/keyboard.py b/vk_api/keyboard.py
index 831363a6..3db8567c 100644
--- a/vk_api/keyboard.py
+++ b/vk_api/keyboard.py
@@ -105,7 +105,7 @@ def add_button(self, label, color=VkKeyboardColor.SECONDARY, payload=None):
 
         color_value = color
 
-        if isinstance(color, VkKeyboardColor):
+        if isinstance(color_value, VkKeyboardColor):
             color_value = color_value.value
 
         if payload is not None and not isinstance(payload, str):
@@ -141,7 +141,7 @@ def add_callback_button(self, label, color=VkKeyboardColor.SECONDARY, payload=No
 
         color_value = color
 
-        if isinstance(color, VkKeyboardColor):
+        if isinstance(color_value, VkKeyboardColor):
             color_value = color_value.value
 
         if payload is not None and not isinstance(payload, str):
@@ -296,8 +296,7 @@ def add_line(self):
         if self.inline:
             if len(self.lines) >= MAX_INLINE_LINES:
                 raise ValueError(f'Max {MAX_INLINE_LINES} lines for inline keyboard')
-        else:
-            if len(self.lines) >= MAX_DEFAULT_LINES:
-                raise ValueError(f'Max {MAX_DEFAULT_LINES} lines for default keyboard')
+        elif len(self.lines) >= MAX_DEFAULT_LINES:
+            raise ValueError(f'Max {MAX_DEFAULT_LINES} lines for default keyboard')
 
         self.lines.append([])
diff --git a/vk_api/longpoll.py b/vk_api/longpoll.py
index e04fbfb4..98ebb12a 100644
--- a/vk_api/longpoll.py
+++ b/vk_api/longpoll.py
@@ -416,14 +416,10 @@ def _parse_peer_id(self):
             self.user_id = self.peer_id
 
     def _parse_message_flags(self):
-        self.message_flags = set(
-            x for x in VkMessageFlag if self.flags & x
-        )
+        self.message_flags = {x for x in VkMessageFlag if self.flags & x}
 
     def _parse_peer_flags(self):
-        self.peer_flags = set(
-            x for x in VkPeerFlag if self.flags & x
-        )
+        self.peer_flags = {x for x in VkPeerFlag if self.flags & x}
 
     def _parse_message(self):
         if self.type is VkEventType.MESSAGE_NEW:
@@ -525,13 +521,13 @@ def update_longpoll_server(self, update_ts=True):
 
         if self.group_id:
             values['group_id'] = self.group_id
-            
+
         response = self.vk.method('messages.getLongPollServer', values)
 
         self.key = response['key']
         self.server = response['server']
 
-        self.url = 'https://' + self.server
+        self.url = f'https://{self.server}'
 
         if update_ts:
             self.ts = response['ts']
@@ -616,5 +612,4 @@ def listen(self):
         """
 
         while True:
-            for event in self.check():
-                yield event
+            yield from self.check()
diff --git a/vk_api/requests_pool.py b/vk_api/requests_pool.py
index cea9cda6..51cf616d 100644
--- a/vk_api/requests_pool.py
+++ b/vk_api/requests_pool.py
@@ -44,10 +44,7 @@ def result(self):
         if self._error:
             raise VkRequestsPoolException(
                 self._error,
-                'Got error while executing request: [{}] {}'.format(
-                    self.error['error_code'],
-                    self.error['error_msg']
-                )
+                f"Got error while executing request: [{self.error['error_code']}] {self.error['error_msg']}",
             )
 
         return self._result
@@ -120,9 +117,7 @@ def execute(self):
         for i in range(0, len(self.pool), 25):
             cur_pool = self.pool[i:i + 25]
 
-            one_method = check_one_method(cur_pool)
-
-            if one_method:
+            if one_method := check_one_method(cur_pool):
                 value_list = [i.values for i in cur_pool]
 
                 response_raw = vk_one_method(
@@ -179,12 +174,9 @@ def check_one_method(pool):
 
 
 def vk_many_methods(vk_session, pool):
-    requests = ','.join(
-        'API.{}({})'.format(i.method, sjson_dumps(i.values))
-        for i in pool
-    )
+    requests = ','.join(f'API.{i.method}({sjson_dumps(i.values)})' for i in pool)
 
-    code = 'return [{}];'.format(requests)
+    code = f'return [{requests}];'
 
     return vk_session.method('execute', {'code': code}, raw=True)
 
diff --git a/vk_api/streaming.py b/vk_api/streaming.py
index 68d11f4d..e7953912 100644
--- a/vk_api/streaming.py
+++ b/vk_api/streaming.py
@@ -122,7 +122,7 @@ def __init__(self, error):
         self.message = error['message']
 
     def __str__(self):
-        return '[{}] {}'.format(self.error_code, self.message)
+        return f'[{self.error_code}] {self.message}'
 
 
 class VkStreamingServiceMessage(VkApiError):
@@ -132,4 +132,4 @@ def __init__(self, error):
         self.message = error['message']
 
     def __str__(self):
-        return '[{}] {}'.format(self.service_code, self.message)
+        return f'[{self.service_code}] {self.message}'
diff --git a/vk_api/tools.py b/vk_api/tools.py
index 8a6d9537..d27c3659 100644
--- a/vk_api/tools.py
+++ b/vk_api/tools.py
@@ -68,10 +68,8 @@ def get_all_iter(self, method, max_count, values=None, key='items',
 
             if 'execute_errors' in response:
                 raise VkToolsException(
-                    'Could not load items: {}'.format(
-                        response['execute_errors']
-                    ),
-                    response=response
+                    f"Could not load items: {response['execute_errors']}",
+                    response=response,
                 )
 
             response = response['response']
@@ -79,9 +77,7 @@ def get_all_iter(self, method, max_count, values=None, key='items',
             items = response["items"]
             items_count += len(items)
 
-            for item in items:
-                yield item
-
+            yield from items
             if not response['more']:
                 break
 
@@ -170,9 +166,7 @@ def get_all_slow_iter(self, method, max_count, values=None, key='items',
             items = response_items[count_diff:]
             items_count += len(items)
 
-            for item in items:
-                yield item
-
+            yield from items
             if len(response_items) < max_count - count_diff:
                 break
 
diff --git a/vk_api/upload.py b/vk_api/upload.py
index 5df8ebdc..1b214224 100644
--- a/vk_api/upload.py
+++ b/vk_api/upload.py
@@ -35,11 +35,7 @@ def __init__(self, vk):
                 'The arg should be VkApi or VkApiMethod instance'
             )
 
-        if isinstance(vk, VkApiMethod):
-            self.vk = vk
-        else:
-            self.vk = vk.get_api()
-
+        self.vk = vk if isinstance(vk, VkApiMethod) else vk.get_api()
         self.http = requests.Session()
         self.http.headers.pop('user-agent')
 
@@ -142,9 +138,7 @@ def photo_profile(self, photo, owner_id=None, crop_x=None, crop_y=None,
         crop_params = {}
 
         if crop_x is not None and crop_y is not None and crop_width is not None:
-            crop_params['_square_crop'] = '{},{},{}'.format(
-                crop_x, crop_y, crop_width
-            )
+            crop_params['_square_crop'] = f'{crop_x},{crop_y},{crop_width}'
 
         response = self.vk.photos.getOwnerPhotoUploadServer(**values)
         url = response['upload_url']
@@ -595,19 +589,14 @@ def open_files(self):
             if hasattr(file, 'read'):
                 f = file
 
-                if hasattr(file, 'name'):
-                    filename = file.name
-                else:
-                    filename = '.jpg'
+                filename = file.name if hasattr(file, 'name') else '.jpg'
             else:
                 filename = file
                 f = open(filename, 'rb')
                 self.opened_files.append(f)
 
             ext = filename.split('.')[-1]
-            files.append(
-                (self.key_format.format(x), ('file{}.{}'.format(x, ext), f))
-            )
+            files.append((self.key_format.format(x), (f'file{x}.{ext}', f)))
 
         return files
 
diff --git a/vk_api/utils.py b/vk_api/utils.py
index 3c0213da..099b0005 100644
--- a/vk_api/utils.py
+++ b/vk_api/utils.py
@@ -20,9 +20,7 @@
 
 def search_re(reg, string):
     """ Поиск по регулярке """
-    s = reg.search(string)
-
-    if s:
+    if s := reg.search(string):
         groups = s.groups()
         return groups[0]
 
@@ -130,6 +128,8 @@ def enable_debug_mode(vk_session, print_content=False):
         print('######### MODULE IS NOT UPDATED!!1 ##########')
         print()
 
+
+
     class DebugHTTPAdapter(requests.adapters.HTTPAdapter):
         def send(self, request, **kwargs):
             start = time.time()
@@ -140,7 +140,7 @@ def send(self, request, **kwargs):
 
             body = request.body
             if body and len(body) > 1024:
-                body = body[:1024] + '[STRIPPED]'
+                body = f'{body[:1024]}[STRIPPED]'
 
             print(
                 '{:0.2f} {} {} {} {} {} {}'.format(
@@ -159,6 +159,7 @@ def send(self, request, **kwargs):
 
             return response
 
+
     vk_session.http.mount('http://', DebugHTTPAdapter())
     vk_session.http.mount('https://', DebugHTTPAdapter())
 
diff --git a/vk_api/vk_api.py b/vk_api/vk_api.py
index fd37a459..6d644ebd 100644
--- a/vk_api/vk_api.py
+++ b/vk_api/vk_api.py
@@ -169,18 +169,18 @@ def auth(self, reauth=False, token_only=False):
         if not self.login:
             raise LoginRequired('Login is required to auth')
 
-        self.logger.info('Auth with login: {}'.format(self.login))
+        self.logger.info(f'Auth with login: {self.login}')
 
         set_cookies_from_list(
             self.http.cookies,
             self.storage.setdefault('cookies', [])
         )
 
-        self.token = self.storage.setdefault(
-            'token', {}
-        ).setdefault(
-            'app' + str(self.app_id), {}
-        ).get('scope_' + str(self.scope))
+        self.token = (
+            self.storage.setdefault('token', {})
+            .setdefault(f'app{str(self.app_id)}', {})
+            .get(f'scope_{str(self.scope)}')
+        )
 
         if token_only:
             self._auth_token(reauth=reauth)
@@ -199,22 +199,14 @@ def _auth_cookies(self, reauth=False):
             return
 
         if not self.check_sid():
-            self.logger.info(
-                'remixsid from config is not valid: {}'.format(
-                    self._sid
-                )
-            )
+            self.logger.info(f'remixsid from config is not valid: {self._sid}')
 
             self._vk_login()
         else:
             self._pass_security_check()
 
         if not self._check_token():
-            self.logger.info(
-                'access_token from config is not valid: {}'.format(
-                    self.token
-                )
-            )
+            self.logger.info(f'access_token from config is not valid: {self.token}')
 
             self._api_login()
         else:
@@ -289,12 +281,7 @@ def _vk_login(self, captcha_sid=None, captcha_key=None):
         }
 
         if captcha_sid and captcha_key:
-            self.logger.info(
-                'Using captcha code: {}: {}'.format(
-                    captcha_sid,
-                    captcha_key
-                )
-            )
+            self.logger.info(f'Using captcha code: {captcha_sid}: {captcha_key}')
             values['captcha_sid'] = captcha_sid
             values['captcha_key'] = captcha_key
 
@@ -330,14 +317,13 @@ def _vk_login(self, captcha_sid=None, captcha_key=None):
 
             self._pass_twofactor(response)
 
-        if self._sid:
-            self.logger.info('Got remixsid')
-
-            self.storage.cookies = cookies_to_list(self.http.cookies)
-            self.storage.save()
-        else:
+        if not self._sid:
             raise AuthError(get_unknown_exc_str('AUTH; no sid'))
 
+        self.logger.info('Got remixsid')
+
+        self.storage.cookies = cookies_to_list(self.http.cookies)
+        self.storage.save()
         response = self._pass_security_check(response)
 
         if 'act=blocked' in response.url:
@@ -363,12 +349,7 @@ def _pass_twofactor(self, auth_response, captcha_sid=None, captcha_key=None):
             'remember': int(remember_device),
         }
         if captcha_sid and captcha_key:
-            self.logger.info(
-                'Using captcha code: {}: {}'.format(
-                    captcha_sid,
-                    captcha_key
-                )
-            )
+            self.logger.info(f'Using captcha code: {captcha_sid}: {captcha_key}')
             values['captcha_sid'] = captcha_sid
             values['captcha_key'] = captcha_key
 
@@ -485,9 +466,7 @@ def _api_login(self):
             raise AccountBlocked('Account is blocked')
 
         if 'access_token' not in response.url:
-            url = search_re(RE_TOKEN_URL, response.text)
-
-            if url:
+            if url := search_re(RE_TOKEN_URL, response.text):
                 response = self.http.get(url)
             elif 'redirect_uri' in response.url:
                 response = self.http.get(response.url)
@@ -523,11 +502,9 @@ def _api_login(self):
 
                 self.token = response.json()['response']
 
-                self.storage.setdefault(
-                    'token', {}
-                ).setdefault(
-                    'app' + str(self.app_id), {}
-                )['scope_' + str(self.scope)] = self.token
+                self.storage.setdefault('token', {}).setdefault(
+                    f'app{str(self.app_id)}', {}
+                )[f'scope_{str(self.scope)}'] = self.token
 
                 self.storage.save()
 
@@ -556,11 +533,9 @@ def _api_login(self):
 
             self.token = token
 
-            self.storage.setdefault(
-                'token', {}
-            ).setdefault(
-                'app' + str(self.app_id), {}
-            )['scope_' + str(self.scope)] = token
+            self.storage.setdefault('token', {}).setdefault(
+                f'app{str(self.app_id)}', {}
+            )[f'scope_{str(self.scope)}'] = token
 
             self.storage.save()
 
@@ -575,7 +550,7 @@ def _api_login(self):
             if error_text and '@vk.com' in error_text:
                 error_text = error_data.get('error')
 
-            raise AuthError('API auth error: {}'.format(error_text))
+            raise AuthError(f'API auth error: {error_text}')
 
         else:
             raise AuthError('Unknown API auth error')
@@ -723,9 +698,9 @@ def method(self, method, values=None, captcha_sid=None, captcha_key=None,
                 time.sleep(delay)
 
             response = self.http.post(
-                'https://api.vk.com/method/' + method,
+                f'https://api.vk.com/method/{method}',
                 values,
-                headers={'Cookie': ''}
+                headers={'Cookie': ''},
             )
             self.last_request = time.time()
 
@@ -790,8 +765,7 @@ def __getattr__(self, method):
             method = m[0] + ''.join(i.title() for i in m[1:])
 
         return VkApiMethod(
-            self._vk,
-            (self._method + '.' if self._method else '') + method
+            self._vk, (f'{self._method}.' if self._method else '') + method
         )
 
     def __call__(self, **kwargs):

From 80b40bd35f2c2c1f9a2e06d33a8687141c404a16 Mon Sep 17 00:00:00 2001
From: SashaXser <24498484+SashaXser@users.noreply.github.com>
Date: Wed, 20 Dec 2023 00:02:10 +0300
Subject: [PATCH 2/6] =?UTF-8?q?=E2=84=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.py                | 12 ++----------
 vk_api/audio.py         |  5 +++--
 vk_api/requests_pool.py |  3 ++-
 vk_api/utils.py         |  3 ++-
 vk_api/vk_api.py        |  3 ++-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/setup.py b/setup.py
index 80e4f200..90770b64 100644
--- a/setup.py
+++ b/setup.py
@@ -19,31 +19,23 @@
 setup(
     name='vk_api',
     version=version,
-
     author='python273',
     author_email='vk_api@python273.pw',
-
     description=(
         'Python модуль для создания скриптов для социальной сети '
         'Вконтакте (vk.com API wrapper)'
     ),
     long_description=long_description,
     long_description_content_type='text/markdown',
-
     url='https://github.com/python273/vk_api',
-    download_url='https://github.com/python273/vk_api/archive/v{}.zip'.format(
-        version
-    ),
-
+    download_url=f'https://github.com/python273/vk_api/archive/v{version}.zip',
     license='Apache License, Version 2.0, see LICENSE file',
-
     packages=['vk_api', 'jconfig'],
     install_requires=['requests'],
     extras_require={
         'vkstreaming': ['websocket-client'],
         'vkaudio': ['beautifulsoup4'],
     },
-
     classifiers=[
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
@@ -54,5 +46,5 @@
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
-    ]
+    ],
 )
diff --git a/vk_api/audio.py b/vk_api/audio.py
index 86a263c8..058335a1 100644
--- a/vk_api/audio.py
+++ b/vk_api/audio.py
@@ -503,12 +503,13 @@ def get_audio_by_id(self, owner_id, audio_id):
             filter_root_el={'class': 'basisDefault'}
         )
 
-        if track := scrap_tracks(
+        track = scrap_tracks(
             ids,
             self.user_id,
             http=self._vk.http,
             convert_m3u8_links=self.convert_m3u8_links,
-        ):
+        )
+        if track:
             return next(track)
         else:
             return []
diff --git a/vk_api/requests_pool.py b/vk_api/requests_pool.py
index 51cf616d..0c20b6c5 100644
--- a/vk_api/requests_pool.py
+++ b/vk_api/requests_pool.py
@@ -117,7 +117,8 @@ def execute(self):
         for i in range(0, len(self.pool), 25):
             cur_pool = self.pool[i:i + 25]
 
-            if one_method := check_one_method(cur_pool):
+            one_method = check_one_method(cur_pool)
+            if one_method:
                 value_list = [i.values for i in cur_pool]
 
                 response_raw = vk_one_method(
diff --git a/vk_api/utils.py b/vk_api/utils.py
index 099b0005..1c60c743 100644
--- a/vk_api/utils.py
+++ b/vk_api/utils.py
@@ -20,7 +20,8 @@
 
 def search_re(reg, string):
     """ Поиск по регулярке """
-    if s := reg.search(string):
+    s = reg.search(string)
+    if s:
         groups = s.groups()
         return groups[0]
 
diff --git a/vk_api/vk_api.py b/vk_api/vk_api.py
index 6d644ebd..8bb2735f 100644
--- a/vk_api/vk_api.py
+++ b/vk_api/vk_api.py
@@ -466,7 +466,8 @@ def _api_login(self):
             raise AccountBlocked('Account is blocked')
 
         if 'access_token' not in response.url:
-            if url := search_re(RE_TOKEN_URL, response.text):
+            url = search_re(RE_TOKEN_URL, response.text)
+            if url:
                 response = self.http.get(url)
             elif 'redirect_uri' in response.url:
                 response = self.http.get(response.url)

From 0da8a8bf5988b2483d4decdca06cb233afc8eab4 Mon Sep 17 00:00:00 2001
From: SashaXser <24498484+SashaXser@users.noreply.github.com>
Date: Wed, 20 Dec 2023 00:08:42 +0300
Subject: [PATCH 3/6] =?UTF-8?q?=E2=84=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vk_api/execute.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/vk_api/execute.py b/vk_api/execute.py
index 3e8c65b8..1bca3149 100644
--- a/vk_api/execute.py
+++ b/vk_api/execute.py
@@ -31,10 +31,14 @@ def __init__(self, code, args=None, clean_args=None, return_raw=False):
         self.return_raw = return_raw
 
     def compile(self, args):
-        compiled_args = {
-            key: str(value) if key in self.clean_args else sjson_dumps(value)
-            for key, value in args.items()
-        }
+        compiled_args = {}
+
+        for key, value in args.items():
+            if key in self.clean_args:
+                compiled_args[key] = str(value)
+            else:
+                compiled_args[key] = sjson_dumps(value)
+
         return self._minified_code % compiled_args
 
     def __call__(self, vk, *args, **kwargs):

From c14a63a5d6a6cfdb422bdd1e0184cf56c5590ab9 Mon Sep 17 00:00:00 2001
From: SashaXser <24498484+SashaXser@users.noreply.github.com>
Date: Wed, 20 Dec 2023 00:15:48 +0300
Subject: [PATCH 4/6] =?UTF-8?q?=E2=84=963?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/requests_pool.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/examples/requests_pool.py b/examples/requests_pool.py
index d0be98c7..6fe1b417 100644
--- a/examples/requests_pool.py
+++ b/examples/requests_pool.py
@@ -67,12 +67,11 @@ def main():
     передать в качестве параметра"""
 
     pool = vk_api.VkRequestsPool(vk_session)
-    friends = {
-        user_id: pool.method(
-            'friends.get', {'user_id': user_id, 'fields': 'photo'}
-        )
-        for user_id in [1, 183433824]
-    }
+    for user_id in [1, 183433824]:
+        friends[user_id] = pool.method('friends.get', {
+            'user_id': user_id,
+            'fields': 'photo'
+        })
     pool.execute()
 
     for key, value in friends.items():

From 390ad1a96b22d1a2552d84c89c3e7a9fe1917ed3 Mon Sep 17 00:00:00 2001
From: SashaXser <24498484+SashaXser@users.noreply.github.com>
Date: Wed, 20 Dec 2023 01:43:43 +0400
Subject: [PATCH 5/6] =?UTF-8?q?=E2=84=964?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/requests_pool.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/examples/requests_pool.py b/examples/requests_pool.py
index 6fe1b417..e2222864 100644
--- a/examples/requests_pool.py
+++ b/examples/requests_pool.py
@@ -49,8 +49,6 @@ def main():
     """ Пример получения друзей у нескольких пользователей за один запрос
     """
 
-    friends = {}
-
     with vk_api.VkRequestsPool(vk_session) as pool:
         for user_id in [1, 183433824]:
             friends[user_id] = pool.method('friends.get', {

From 45f7dde4e5b66078c4d04d787a1b83d0b9f7e992 Mon Sep 17 00:00:00 2001
From: SashaXser <24498484+SashaXser@users.noreply.github.com>
Date: Wed, 20 Dec 2023 00:53:52 +0300
Subject: [PATCH 6/6] =?UTF-8?q?=E2=84=965?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/requests_pool.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/requests_pool.py b/examples/requests_pool.py
index e2222864..3c6d7f94 100644
--- a/examples/requests_pool.py
+++ b/examples/requests_pool.py
@@ -49,6 +49,8 @@ def main():
     """ Пример получения друзей у нескольких пользователей за один запрос
     """
 
+    friends = {}
+
     with vk_api.VkRequestsPool(vk_session) as pool:
         for user_id in [1, 183433824]:
             friends[user_id] = pool.method('friends.get', {
@@ -64,12 +66,15 @@ def main():
     """Пример использования пула в виде объекта. Такой пул можно
     передать в качестве параметра"""
 
+    friends = {}
+    
     pool = vk_api.VkRequestsPool(vk_session)
     for user_id in [1, 183433824]:
         friends[user_id] = pool.method('friends.get', {
             'user_id': user_id,
             'fields': 'photo'
         })
+        
     pool.execute()
 
     for key, value in friends.items():
@@ -101,4 +106,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()
\ No newline at end of file