python-telegram-bot · Bibo-Joshi · Apr 17, 2022 · Mar 9, 2022 · Mar 9, 2022 · Mar 11, 2022
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -127,6 +127,9 @@
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
+# Decides the language used for syntax highlighting of code blocks.
+highlight_language = 'python3'
+
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 

diff --git a/telegram/_bot.py b/telegram/_bot.py
diff --git a/telegram/_callbackquery.py b/telegram/_callbackquery.py
@@ -47,7 +47,7 @@ class CallbackQuery(TelegramObject):
     considered equal, if their :attr:`id` is equal.
 
     Note:
-        * In Python :keyword:`from` is a reserved word, :paramref:`from_user`
+        * In Python :keyword:`from` is a reserved word use :paramref:`from_user` instead.
         * Exactly one of the fields :attr:`data` or :attr:`game_short_name` will be present.
         * After the user presses an inline button, Telegram clients will display a progress bar
           until you call :attr:`answer`. It is, therefore, necessary to react

diff --git a/telegram/_chat.py b/telegram/_chat.py
@@ -68,7 +68,7 @@ class Chat(TelegramObject):
     Args:
         id (:obj:`int`): Unique identifier for this chat. This number may be greater than 32 bits
             and some programming languages may have difficulty/silent defects in interpreting it.
-            But it is smaller than 52 bits, so a signed 64 bit integer or double-precision float
+            But it is smaller than 52 bits, so a signed 64-bit integer or double-precision float
             type are safe for storing this identifier.
         type (:obj:`str`): Type of chat, can be either :attr:`PRIVATE`, :attr:`GROUP`,
             :attr:`SUPERGROUP` or :attr:`CHANNEL`.
@@ -906,8 +906,8 @@ async def send_media_group(
         ],
         disable_notification: ODVInput[bool] = DEFAULT_NONE,
         reply_to_message_id: int = None,
-        read_timeout: float = 20,
-        write_timeout: float = 20,
+        read_timeout: ODVInput[float] = DEFAULT_NONE,
+        write_timeout: ODVInput[float] = 20,
         connect_timeout: ODVInput[float] = DEFAULT_NONE,
         pool_timeout: ODVInput[float] = DEFAULT_NONE,
         api_kwargs: JSONDict = None,
@@ -977,8 +977,8 @@ async def send_photo(
         disable_notification: DVInput[bool] = DEFAULT_NONE,
         reply_to_message_id: int = None,
         reply_markup: ReplyMarkup = None,
-        read_timeout: float = 20,
-        write_timeout: float = 20,
+        read_timeout: ODVInput[float] = DEFAULT_NONE,
+        write_timeout: ODVInput[float] = 20,
         connect_timeout: ODVInput[float] = DEFAULT_NONE,
         pool_timeout: ODVInput[float] = DEFAULT_NONE,
         parse_mode: ODVInput[str] = DEFAULT_NONE,
@@ -1074,8 +1074,8 @@ async def send_audio(
         disable_notification: DVInput[bool] = DEFAULT_NONE,
         reply_to_message_id: int = None,
         reply_markup: ReplyMarkup = None,
-        read_timeout: float = 20,
-        write_timeout: float = 20,
+        read_timeout: ODVInput[float] = DEFAULT_NONE,
+        write_timeout: ODVInput[float] = 20,
         connect_timeout: ODVInput[float] = DEFAULT_NONE,
         pool_timeout: ODVInput[float] = DEFAULT_NONE,
         parse_mode: ODVInput[str] = DEFAULT_NONE,
@@ -1127,8 +1127,8 @@ async def send_document(
         disable_notification: DVInput[bool] = DEFAULT_NONE,
         reply_to_message_id: int = None,
         reply_markup: ReplyMarkup = None,
-        read_timeout: float = 20,
-        write_timeout: float = 20,
+        read_timeout: ODVInput[float] = DEFAULT_NONE,
+        write_timeout: ODVInput[float] = 20,
         connect_timeout: ODVInput[float] = DEFAULT_NONE,
         pool_timeout: ODVInput[float] = DEFAULT_NONE,
         parse_mode: ODVInput[str] = DEFAULT_NONE,
@@ -1398,8 +1398,8 @@ async def send_animation(
         disable_notification: DVInput[bool] = DEFAULT_NONE,
         reply_to_message_id: int = None,
         reply_markup: ReplyMarkup = None,
-        read_timeout: float = 20,
-        write_timeout: float = 20,
+        read_timeout: ODVInput[float] = DEFAULT_NONE,
+        write_timeout: ODVInput[float] = 20,
         connect_timeout: ODVInput[float] = DEFAULT_NONE,
         pool_timeout: ODVInput[float] = DEFAULT_NONE,
         api_kwargs: JSONDict = None,
@@ -1447,8 +1447,8 @@ async def send_sticker(
         disable_notification: DVInput[bool] = DEFAULT_NONE,
         reply_to_message_id: int = None,
         reply_markup: ReplyMarkup = None,
-        read_timeout: float = 20,
-        write_timeout: float = 20,
+        read_timeout: ODVInput[float] = DEFAULT_NONE,
+        write_timeout: ODVInput[float] = 20,
         connect_timeout: ODVInput[float] = DEFAULT_NONE,
         pool_timeout: ODVInput[float] = DEFAULT_NONE,
         api_kwargs: JSONDict = None,
@@ -1543,8 +1543,8 @@ async def send_video(
         disable_notification: DVInput[bool] = DEFAULT_NONE,
         reply_to_message_id: int = None,
         reply_markup: ReplyMarkup = None,
-        read_timeout: float = 20,
-        write_timeout: float = 20,
+        read_timeout: ODVInput[float] = DEFAULT_NONE,
+        write_timeout: ODVInput[float] = 20,
         connect_timeout: ODVInput[float] = DEFAULT_NONE,
         pool_timeout: ODVInput[float] = DEFAULT_NONE,
         width: int = None,
@@ -1600,8 +1600,8 @@ async def send_video_note(
         disable_notification: DVInput[bool] = DEFAULT_NONE,
         reply_to_message_id: int = None,
         reply_markup: ReplyMarkup = None,
-        read_timeout: float = 20,
-        write_timeout: float = 20,
+        read_timeout: ODVInput[float] = DEFAULT_NONE,
+        write_timeout: ODVInput[float] = 20,
         connect_timeout: ODVInput[float] = DEFAULT_NONE,
         pool_timeout: ODVInput[float] = DEFAULT_NONE,
         thumb: FileInput = None,
@@ -1647,8 +1647,8 @@ async def send_voice(
         disable_notification: DVInput[bool] = DEFAULT_NONE,
         reply_to_message_id: int = None,
         reply_markup: ReplyMarkup = None,
-        read_timeout: float = 20,
-        write_timeout: float = 20,
+        read_timeout: ODVInput[float] = DEFAULT_NONE,
+        write_timeout: ODVInput[float] = 20,
         connect_timeout: ODVInput[float] = DEFAULT_NONE,
         pool_timeout: ODVInput[float] = DEFAULT_NONE,
         parse_mode: ODVInput[str] = DEFAULT_NONE,

diff --git a/telegram/_chatjoinrequest.py b/telegram/_chatjoinrequest.py
@@ -62,13 +62,7 @@ class ChatJoinRequest(TelegramObject):
 
     """
 
-    __slots__ = (
-        'chat',
-        'from_user',
-        'date',
-        'bio',
-        'invite_link',
-    )
+    __slots__ = ('chat', 'from_user', 'date', 'bio', 'invite_link')
 
     def __init__(
         self,

diff --git a/telegram/_chatmemberupdated.py b/telegram/_chatmemberupdated.py
@@ -38,7 +38,7 @@ class ChatMemberUpdated(TelegramObject):
     .. versionadded:: 13.4
 
     Note:
-        In Python :keyword:`from` is a reserved word, :paramref:`from_user`
+        In Python :keyword:`from` is a reserved word use :paramref:`from_user` instead.
 
     Args:
         chat (:class:`telegram.Chat`): Chat the user belongs to.

diff --git a/telegram/_choseninlineresult.py b/telegram/_choseninlineresult.py
@@ -37,7 +37,7 @@ class ChosenInlineResult(TelegramObject):
     considered equal, if their :attr:`result_id` is equal.
 
     Note:
-        * In Python :keyword:`from` is a reserved word, :paramref:`from_user`
+        * In Python :keyword:`from` is a reserved word use :paramref:`from_user` instead.
         * It is necessary to enable inline feedback via `@Botfather <https://t.me/BotFather>`_ in
           order to receive these objects in updates.
 

diff --git a/telegram/_files/_basethumbedmedium.py b/telegram/_files/_basethumbedmedium.py
@@ -30,8 +30,8 @@
 
 
 class _BaseThumbedMedium(_BaseMedium):
-    """Base class for objects representing the various media file types that may include a
-        thumbnail.
+    """
+    Base class for objects representing the various media file types that may include a thumbnail.
 
     Objects of this class are comparable in terms of equality. Two objects of this class are
     considered equal, if their :attr:`file_unique_id` is equal.

diff --git a/telegram/_files/file.py b/telegram/_files/file.py
@@ -46,7 +46,7 @@ class File(TelegramObject):
         * Maximum file size to download is
             :tg-const:`telegram.constants.FileSizeLimit.FILESIZE_DOWNLOAD`.
         * If you obtain an instance of this class from :attr:`telegram.PassportFile.get_file`,
-          then it will automatically be decrypted as it downloads when you call :attr:`download()`.
+          then it will automatically be decrypted as it downloads when you call :meth:`download()`.
 
     Args:
         file_id (:obj:`str`): Identifier for this file, which can be used to download
@@ -65,7 +65,7 @@ class File(TelegramObject):
             is supposed to be the same over time and for different bots.
             Can't be used to download or reuse the file.
         file_size (:obj:`str`): Optional. File size in bytes.
-        file_path (:obj:`str`): Optional. File path. Use :attr:`download` to get the file.
+        file_path (:obj:`str`): Optional. File path. Use :meth:`download` to get the file.
 
     """
 
@@ -102,8 +102,8 @@ async def download(
         custom_path: FilePathInput = None,
         out: IO = None,
         read_timeout: ODVInput[float] = DEFAULT_NONE,
-        connect_timeout: ODVInput[float] = DEFAULT_NONE,
         write_timeout: ODVInput[float] = DEFAULT_NONE,
+        connect_timeout: ODVInput[float] = DEFAULT_NONE,
         pool_timeout: ODVInput[float] = DEFAULT_NONE,
     ) -> Union[Path, IO]:
         """
@@ -129,9 +129,18 @@ async def download(
             custom_path (:class:`pathlib.Path` | :obj:`str`, optional): Custom path.
             out (:obj:`io.BufferedWriter`, optional): A file-like object. Must be opened for
                 writing in binary mode, if applicable.
-            timeout (:obj:`int` | :obj:`float`, optional): If this value is specified, use it as
-                the read timeout from the server (instead of the one specified during creation of
-                the connection pool).
+            read_timeout (:obj:`float` | :obj:`None`, optional): Value to pass to
+                :paramref:`telegram.request.BaseRequest.post.read_timeout`. Defaults to
+                :attr:`~telegram.request.BaseRequest.DEFAULT_NONE`.
+            write_timeout (:obj:`float` | :obj:`None`, optional):  Value to pass to
+                :paramref:`telegram.request.BaseRequest.post.write_timeout`. Defaults to
+                :attr:`~telegram.request.BaseRequest.DEFAULT_NONE`.
+            connect_timeout (:obj:`float` | :obj:`None`, optional): Value to pass to
+                :paramref:`telegram.request.BaseRequest.post.connect_timeout`. Defaults to
+                :attr:`~telegram.request.BaseRequest.DEFAULT_NONE`.
+            pool_timeout (:obj:`float` | :obj:`None`, optional):  Value to pass to
+                :paramref:`telegram.request.BaseRequest.post.pool_timeout`. Defaults to
+                :attr:`~telegram.request.BaseRequest.DEFAULT_NONE`.
 
         Returns:
             :class:`pathlib.Path` | :obj:`io.BufferedWriter`: The same object as :paramref:`out` if

diff --git a/telegram/_files/inputfile.py b/telegram/_files/inputfile.py
@@ -40,17 +40,15 @@ class InputFile:
             bytes.
 
             Note:
-                If ``obj`` is a string, it will be encoded as bytes via ``obj.encode('utf-8')``.
+                If :paramref:`obj` is a string, it will be encoded as bytes via
+                :external:obj:`obj.encode('utf-8') <str.encode>`.
         filename (:obj:`str`, optional): Filename for this InputFile.
 
-    Raises:
-        TelegramError
-
     Attributes:
         input_file_content (:obj:`bytes`): The binary content of the file to send.
         attach_name (:obj:`str`): Attach name.
-        filename (:obj:`str`): Optional. Filename for the file to be sent.
-        mimetype (:obj:`str`): Optional. The mimetype inferred from the file to be sent.
+        filename (:obj:`str`): Filename for the file to be sent.
+        mimetype (:obj:`str`): The mimetype inferred from the file to be sent.
 
     """