Sourcery refactored backup branch

readthedocs/custom_roles.py

@@ -22,10 +22,9 @@ def make_link_node(rawtext, app, name, options):
         base += '/'
 
     set_classes(options)
-    node = nodes.reference(rawtext, utils.unescape(name),
-                           refuri='{}?q={}'.format(base, name),
-                           **options)
-    return node
+    return nodes.reference(
+        rawtext, utils.unescape(name), refuri=f'{base}?q={name}', **options
+    )
 
 
 # noinspection PyUnusedLocal

setup.py

@@ -166,10 +166,12 @@ def main(argv):
             return
 
         remove_dirs = ['__pycache__', 'build', 'dist', 'Telethon.egg-info']
-        for root, _dirs, _files in os.walk(LIBRARY_DIR, topdown=False):
-            # setuptools is including __pycache__ for some reason (#1605)
-            if root.endswith('/__pycache__'):
-                remove_dirs.append(root)
+        remove_dirs.extend(
+            root
+            for root, _dirs, _files in os.walk(LIBRARY_DIR, topdown=False)
+            if root.endswith('/__pycache__')
+        )
+
         for x in remove_dirs:
             shutil.rmtree(x, ignore_errors=True)
 

telethon/client/account.py

@@ -101,7 +101,7 @@ def __getattr__(self, name):
         return value
 
     def __setattr__(self, name, value):
-        if name.startswith('_{}__'.format(type(self).__name__.lstrip('_'))):
+        if name.startswith(f"_{type(self).__name__.lstrip('_')}__"):
             # This is our own name-mangled attribute, keep calm.
             return super().__setattr__(name, value)
         return setattr(self.__client, name, value)

telethon/client/auth.py

@@ -222,10 +222,10 @@ async def _start(
             attempts += 1
         else:
             raise RuntimeError(
-                '{} consecutive sign-in attempts failed. Aborting'
-                .format(max_attempts)
+                f'{max_attempts} consecutive sign-in attempts failed. Aborting'
             )
 
+
         if two_step_detected:
             if not password:
                 raise ValueError(

telethon/client/chats.py

@@ -277,8 +277,9 @@ async def _init(
             if not utils.is_list_like(admins):
                 admins = (admins,)
 
-            for admin in admins:
-                admin_list.append(await self.client.get_input_entity(admin))
+            admin_list.extend(
+                await self.client.get_input_entity(admin) for admin in admins
+            )
 
         self.request = functions.channels.GetAdminLogRequest(
             self.entity, q=search or '', min_id=min_id, max_id=max_id,
@@ -825,14 +826,13 @@ def action(
             try:
                 action = _ChatAction._str_mapping[action.lower()]
             except KeyError:
-                raise ValueError(
-                    'No such action "{}"'.format(action)) from None
+                raise ValueError(f'No such action "{action}"') from None
         elif not isinstance(action, types.TLObject) or action.SUBCLASS_OF_ID != 0x20b2cc21:
             # 0x20b2cc21 = crc32(b'SendMessageAction')
             if isinstance(action, type):
                 raise ValueError('You must pass an instance, not the class')
             else:
-                raise ValueError('Cannot use {} as action'.format(action))
+                raise ValueError(f'Cannot use {action} as action')
 
         if isinstance(action, types.SendMessageCancelAction):
             # ``SetTypingRequest.resolve`` will get input peer of ``entity``.

telethon/client/dialogs.py

@@ -116,10 +116,8 @@ async def _init(self, entities, **kwargs):
             items = r.updates
         else:
             peers = []
-            for entity in entities:
-                peers.append(types.InputDialogPeer(
-                    await self.client.get_input_entity(entity)))
-
+            peers.extend(types.InputDialogPeer(
+                    await self.client.get_input_entity(entity)) for entity in entities)
             r = await self.client(functions.messages.GetPeerDialogsRequest(peers))
             items = r.dialogs
 
@@ -310,10 +308,7 @@ async def get_drafts(
                 print(drafts.text)
         """
         items = await self.iter_drafts(entity).collect()
-        if not entity or utils.is_list_like(entity):
-            return items
-        else:
-            return items[0]
+        return items if not entity or utils.is_list_like(entity) else items[0]
 
     async def edit_folder(
             self: 'TelegramClient',
@@ -380,11 +375,11 @@ async def edit_folder(
                 folder_id=unpack
             ))
 
-        if not utils.is_list_like(entity):
-            entities = [await self.get_input_entity(entity)]
-        else:
-            entities = await asyncio.gather(
-                *(self.get_input_entity(x) for x in entity))
+        entities = (
+            await asyncio.gather(*(self.get_input_entity(x) for x in entity))
+            if utils.is_list_like(entity)
+            else [await self.get_input_entity(entity)]
+        )
 
         if folder is None:
             raise ValueError('You must specify a folder')
@@ -443,11 +438,7 @@ async def delete_dialog(
         """
         # If we have enough information (`Dialog.delete` gives it to us),
         # then we know we don't have to kick ourselves in deactivated chats.
-        if isinstance(entity, types.Chat):
-            deactivated = entity.deactivated
-        else:
-            deactivated = False
-
+        deactivated = entity.deactivated if isinstance(entity, types.Chat) else False
         entity = await self.get_input_entity(entity)
         ty = helpers._entity_type(entity)
         if ty == helpers._EntityType.CHANNEL:

telethon/client/downloads.py

@@ -256,33 +256,30 @@ async def download_profile_photo(
             if not hasattr(entity, 'photo'):
                 # Special case: may be a ChatFull with photo:Photo
                 # This is different from a normal UserProfilePhoto and Chat
-                if not hasattr(entity, 'chat_photo'):
-                    return None
-
                 return await self._download_photo(
                     entity.chat_photo, file, date=None,
                     thumb=thumb, progress_callback=None
-                )
-
-            for attr in ('username', 'first_name', 'title'):
-                possible_names.append(getattr(entity, attr, None))
+                ) if hasattr(entity, 'chat_photo') else None
+            possible_names.extend(
+                getattr(entity, attr, None)
+                for attr in ('username', 'first_name', 'title')
+            )
 
             photo = entity.photo
 
-        if isinstance(photo, (types.UserProfilePhoto, types.ChatPhoto)):
-            dc_id = photo.dc_id
-            loc = types.InputPeerPhotoFileLocation(
-                peer=await self.get_input_entity(entity),
-                photo_id=photo.photo_id,
-                big=download_big
-            )
-        else:
+        if not isinstance(photo, (types.UserProfilePhoto, types.ChatPhoto)):
             # It doesn't make any sense to check if `photo` can be used
             # as input location, because then this method would be able
             # to "download the profile photo of a message", i.e. its
             # media which should be done with `download_media` instead.
             return None
 
+        dc_id = photo.dc_id
+        loc = types.InputPeerPhotoFileLocation(
+            peer=await self.get_input_entity(entity),
+            photo_id=photo.photo_id,
+            big=download_big
+        )
         file = self._get_proper_filename(
             file, 'profile_photo', '.jpg',
             possible_names=possible_names
@@ -296,16 +293,15 @@ async def download_profile_photo(
             # The fix seems to be using the full channel chat photo.
             ie = await self.get_input_entity(entity)
             ty = helpers._entity_type(ie)
-            if ty == helpers._EntityType.CHANNEL:
-                full = await self(functions.channels.GetFullChannelRequest(ie))
-                return await self._download_photo(
-                    full.full_chat.chat_photo, file,
-                    date=None, progress_callback=None,
-                    thumb=thumb
-                )
-            else:
+            if ty != helpers._EntityType.CHANNEL:
                 # Until there's a report for chats, no need to.
                 return None
+            full = await self(functions.channels.GetFullChannelRequest(ie))
+            return await self._download_photo(
+                full.full_chat.chat_photo, file,
+                date=None, progress_callback=None,
+                thumb=thumb
+            )
 
     async def download_media(
             self: 'TelegramClient',
@@ -398,14 +394,15 @@ def callback(current, total):
         if isinstance(media, str):
             media = utils.resolve_bot_file_id(media)
 
-        if isinstance(media, types.MessageService):
-            if isinstance(message.action,
-                          types.MessageActionChatEditPhoto):
-                media = media.photo
-
-        if isinstance(media, types.MessageMediaWebPage):
-            if isinstance(media.webpage, types.WebPage):
-                media = media.webpage.document or media.webpage.photo
+        if isinstance(media, types.MessageService) and isinstance(
+            message.action, types.MessageActionChatEditPhoto
+        ):
+            media = media.photo
+
+        if isinstance(media, types.MessageMediaWebPage) and isinstance(
+            media.webpage, types.WebPage
+        ):
+            media = media.webpage.document or media.webpage.photo
 
         if isinstance(media, (types.MessageMediaPhoto, types.Photo)):
             return await self._download_photo(
@@ -511,11 +508,7 @@ async def _download_file(
             iv: bytes = None,
             msg_data: tuple = None) -> typing.Optional[bytes]:
         if not part_size_kb:
-            if not file_size:
-                part_size_kb = 64  # Reasonable default
-            else:
-                part_size_kb = utils.get_appropriated_part_size(file_size)
-
+            part_size_kb = utils.get_appropriated_part_size(file_size) if file_size else 64
         part_size = int(part_size_kb * 1024)
         if part_size % MIN_CHUNK_SIZE != 0:
             raise ValueError(
@@ -846,9 +839,7 @@ def _get_kind_and_names(attributes):
             elif isinstance(attr, types.DocumentAttributeAudio):
                 kind = 'audio'
                 if attr.performer and attr.title:
-                    possible_names.append('{} - {}'.format(
-                        attr.performer, attr.title
-                    ))
+                    possible_names.append(f'{attr.performer} - {attr.title}')
                 elif attr.performer:
                     possible_names.append(attr.performer)
                 elif attr.title:
@@ -1035,7 +1026,7 @@ def _get_proper_filename(file, kind, extension,
 
         i = 1
         while True:
-            result = os.path.join(directory, '{} ({}){}'.format(name, i, ext))
+            result = os.path.join(directory, f'{name} ({i}){ext}')
             if not os.path.isfile(result):
                 return result
             i += 1

telethon/client/messageparse.py

@@ -87,12 +87,11 @@ async def _parse_message_text(self: 'TelegramClient', message, parse_mode):
         message, msg_entities = parse_mode.parse(message)
         if original_message and not message and not msg_entities:
             raise ValueError("Failed to parse message")
-        
+
         for i in reversed(range(len(msg_entities))):
             e = msg_entities[i]
             if isinstance(e, types.MessageEntityTextUrl):
-                m = re.match(r'^@|\+|tg://user\?id=(\d+)', e.url)
-                if m:
+                if m := re.match(r'^@|\+|tg://user\?id=(\d+)', e.url):
                     user = int(m.group(1)) if m.group(1) else e.url
                     is_mention = await self._replace_with_mention(msg_entities, i, user)
                     if not is_mention: