closing remarks from pieter

Poolitzer · Poolitzer · commit 06c269c27581 · 2020-02-10T20:52:26.000-08:00
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -2849,8 +2849,8 @@ def set_chat_administrator_custom_title(self,
                                             timeout=None,
                                             **kwargs):
         """
-        Use this method to set custom title for owner or administrators. The bot must be an
-        administrator in the supergroup for this to work. Returns True on success.
+        Use this method to set a custom title for administrators promoted by the bot in a
+        supergroup. The bot must be an administrator for this to work. Returns True on success.
 
         Args:
             chat_id (:obj:`int` | :obj:`str`): Unique identifier for the target chat or username of
@@ -3594,7 +3594,7 @@ def __reduce__(self):
     setChatPermissions = set_chat_permissions
     """Alias for :attr:`set_chat_permissions`"""
     setChatAdministratorCustomTitle = set_chat_administrator_custom_title
-    """Alias for :attr:`set_chat_administrator_custom_title"""
+    """Alias for :attr:`set_chat_administrator_custom_title`"""
     exportChatInviteLink = export_chat_invite_link
     """Alias for :attr:`export_chat_invite_link`"""
     setChatPhoto = set_chat_photo
diff --git a/telegram/chat.py b/telegram/chat.py
@@ -100,9 +100,9 @@ def __init__(self,
                  invite_link=None,
                  pinned_message=None,
                  permissions=None,
-                 slow_mode_delay=None,
                  sticker_set_name=None,
                  can_set_sticker_set=None,
+                 slow_mode_delay=None,
                  **kwargs):
         # Required
         self.id = int(id)
diff --git a/telegram/chatmember.py b/telegram/chatmember.py
@@ -115,13 +115,13 @@ class ChatMember(TelegramObject):
     RESTRICTED = 'restricted'
     """:obj:`str`: 'restricted'"""
 
-    def __init__(self, user, status, custom_title=None, until_date=None, can_be_edited=None,
+    def __init__(self, user, status, until_date=None, can_be_edited=None,
                  can_change_info=None, can_post_messages=None, can_edit_messages=None,
                  can_delete_messages=None, can_invite_users=None,
                  can_restrict_members=None, can_pin_messages=None,
                  can_promote_members=None, can_send_messages=None,
                  can_send_media_messages=None, can_send_polls=None, can_send_other_messages=None,
-                 can_add_web_page_previews=None, is_member=None, **kwargs):
+                 can_add_web_page_previews=None, is_member=None, custom_title=None, **kwargs):
         # Required
         self.user = user
         self.status = status
diff --git a/telegram/files/animation.py b/telegram/files/animation.py
@@ -25,7 +25,7 @@ class Animation(TelegramObject):
     """This object represents an animation file to be displayed in the message containing a game.
 
     Attributes:
-        file_id (:obj:`str`): Unique file identifier.
+        file_id (:obj:`str`): File identifier.
         file_unique_id (:obj:`str`): Unique identifier for this file, which
             is supposed to be the same over time and for different bots.
             Can't be used to download or reuse the file.
@@ -40,7 +40,8 @@ class Animation(TelegramObject):
         bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
 
     Args:
-        file_id (:obj:`str`): Unique file identifier.
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
         file_unique_id (:obj:`str`): Unique and the same over time and
             for different bots file identifier.
         width (:obj:`int`): Video width as defined by sender.
diff --git a/telegram/files/audio.py b/telegram/files/audio.py
@@ -26,7 +26,7 @@ class Audio(TelegramObject):
 
     Attributes:
         file_id (:obj:`str`): Unique identifier for this file.
-        file_id (:obj:`str`): Unique identifier for this file, which
+        file_unique_id (:obj:`str`): Unique identifier for this file, which
             is supposed to be the same over time and for different bots.
             Can't be used to download or reuse the file.
         duration (:obj:`int`): Duration of the audio in seconds.
@@ -40,7 +40,8 @@ class Audio(TelegramObject):
         bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
 
     Args:
-        file_id (:obj:`str`): Unique identifier for this file.
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
         file_unique_id (:obj:`str`): Unique and the same over time and
             for different bots file identifier.
         duration (:obj:`int`): Duration of the audio in seconds as defined by sender.
diff --git a/telegram/files/document.py b/telegram/files/document.py
@@ -36,7 +36,8 @@ class Document(TelegramObject):
         bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
 
     Args:
-        file_id (:obj:`str`): Unique file identifier.
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
         file_unique_id (:obj:`str`): Unique and the same over time and
             for different bots file identifier.
         thumb (:class:`telegram.PhotoSize`, optional): Document thumbnail as defined by sender.
diff --git a/telegram/files/file.py b/telegram/files/file.py
@@ -44,7 +44,8 @@ class File(TelegramObject):
         file_path (:obj:`str`): Optional. File path. Use :attr:`download` to get the file.
 
     Args:
-        file_id (:obj:`str`): Unique identifier for this file.
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
         file_unique_id (:obj:`str`): Unique and the same over time and
             for different bots file identifier.
         file_size (:obj:`int`, optional): Optional. File size, if known.
diff --git a/telegram/files/photosize.py b/telegram/files/photosize.py
@@ -35,7 +35,8 @@ class PhotoSize(TelegramObject):
         bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
 
     Args:
-        file_id (:obj:`str`): Unique identifier for this file.
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
         file_unique_id (:obj:`str`): Unique and the same over time and
             for different bots file identifier.
         width (:obj:`int`): Photo width.
diff --git a/telegram/files/sticker.py b/telegram/files/sticker.py
@@ -42,7 +42,8 @@ class Sticker(TelegramObject):
         bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
 
     Args:
-        file_id (:obj:`str`): Unique identifier for this file.
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
         file_unique_id (:obj:`str`): Unique and the same over time and
             for different bots file identifier.
         width (:obj:`int`): Sticker width.
diff --git a/telegram/files/video.py b/telegram/files/video.py
@@ -38,7 +38,8 @@ class Video(TelegramObject):
         bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
 
     Args:
-        file_id (:obj:`str`): Unique identifier for this file.
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
         file_unique_id (:obj:`str`): Unique and the same over time and
             for different bots file identifier.
         width (:obj:`int`): Video width as defined by sender.
diff --git a/telegram/files/videonote.py b/telegram/files/videonote.py
@@ -36,7 +36,8 @@ class VideoNote(TelegramObject):
         bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
 
     Args:
-        file_id (:obj:`str`): Unique identifier for this file.
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
         file_unique_id (:obj:`str`): Unique and the same over time and
             for different bots file identifier.
         length (:obj:`int`): Video width and height as defined by sender.
diff --git a/telegram/files/voice.py b/telegram/files/voice.py
@@ -35,7 +35,8 @@ class Voice(TelegramObject):
         bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
 
     Args:
-        file_id (:obj:`str`): Unique identifier for this file.
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
         file_unique_id (:obj:`str`): Unique and the same over time and
             for different bots file identifier.
         duration (:obj:`int`, optional): Duration of the audio in seconds as defined by sender.
diff --git a/telegram/passport/passportfile.py b/telegram/passport/passportfile.py
@@ -36,7 +36,8 @@ class PassportFile(TelegramObject):
         bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
 
     Args:
-        file_id (:obj:`str`): Unique identifier for this file.
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
         file_unique_id (:obj:`str`): Unique and the same over time and
             for different bots file identifier.
         file_size (:obj:`int`): File size.
diff --git a/tests/test_message.py b/tests/test_message.py
@@ -168,8 +168,6 @@ def test_dict_approach(self, message):
         assert message['chat_id'] == message.chat_id
         assert message['no_key'] is None
 
-    # START WORKING HERE
-
     def test_parse_entity(self):
         text = (b'\\U0001f469\\u200d\\U0001f469\\u200d\\U0001f467'
                 b'\\u200d\\U0001f467\\U0001f431http://google.com').decode('unicode-escape')
