python-telegram-bot · Bibo-Joshi · Oct 15, 2021 · Jul 14, 2021 · Aug 11, 2021 · Aug 11, 2021
diff --git a/docs/source/telegram.animation.rst b/docs/source/telegram.animation.rst
@@ -3,6 +3,9 @@
 telegram.Animation
 ==================
 
+.. Also lists methods of _BaseThumbedMedium, but not the ones of TelegramObject
+
 .. autoclass:: telegram.Animation
     :members:
     :show-inheritance:
+    :inherited-members: TelegramObject
diff --git a/docs/source/telegram.audio.rst b/docs/source/telegram.audio.rst
@@ -3,6 +3,9 @@
 telegram.Audio
 ==============
 
+.. Also lists methods of _BaseThumbedMedium, but not the ones of TelegramObject
+
 .. autoclass:: telegram.Audio
     :members:
     :show-inheritance:
+    :inherited-members: TelegramObject
diff --git a/docs/source/telegram.document.rst b/docs/source/telegram.document.rst
@@ -2,7 +2,9 @@
 
 telegram.Document
 =================
+.. Also lists methods of _BaseThumbedMedium, but not the ones of TelegramObject
 
 .. autoclass:: telegram.Document
     :members:
     :show-inheritance:
+    :inherited-members: TelegramObject
diff --git a/docs/source/telegram.photosize.rst b/docs/source/telegram.photosize.rst
@@ -2,7 +2,9 @@
 
 telegram.PhotoSize
 ==================
+.. Also lists methods of _BaseThumbedMedium, but not the ones of TelegramObject
 
 .. autoclass:: telegram.PhotoSize
     :members:
     :show-inheritance:
+    :inherited-members: TelegramObject
diff --git a/docs/source/telegram.sticker.rst b/docs/source/telegram.sticker.rst
@@ -3,6 +3,9 @@
 telegram.Sticker
 ================
 
+.. Also lists methods of _BaseThumbedMedium, but not the ones of TelegramObject
+
 .. autoclass:: telegram.Sticker
     :members:
     :show-inheritance:
+    :inherited-members: TelegramObject
diff --git a/docs/source/telegram.video.rst b/docs/source/telegram.video.rst
@@ -3,6 +3,9 @@
 telegram.Video
 ==============
 
+.. Also lists methods of _BaseThumbedMedium, but not the ones of TelegramObject
+
 .. autoclass:: telegram.Video
     :members:
     :show-inheritance:
+    :inherited-members: TelegramObject
diff --git a/docs/source/telegram.videonote.rst b/docs/source/telegram.videonote.rst
@@ -3,6 +3,9 @@
 telegram.VideoNote
 ==================
 
+.. Also lists methods of _BaseThumbedMedium, but not the ones of TelegramObject
+
 .. autoclass:: telegram.VideoNote
     :members:
     :show-inheritance:
+    :inherited-members: TelegramObject
diff --git a/docs/source/telegram.voice.rst b/docs/source/telegram.voice.rst
@@ -3,6 +3,9 @@
 telegram.Voice
 ==============
 
+.. Also lists methods of _BaseThumbedMedium, but not the ones of TelegramObject
+
 .. autoclass:: telegram.Voice
     :members:
     :show-inheritance:
+    :inherited-members: TelegramObject
diff --git a/telegram/_bot.py b/telegram/_bot.py
@@ -223,9 +223,7 @@ def _insert_defaults(  # pylint: disable=no-self-use
         for key, val in data.items():
             # 1)
             if isinstance(val, InputMedia):
-                val.parse_mode = DefaultValue.get_value(  # type: ignore[attr-defined]
-                    val.parse_mode  # type: ignore[attr-defined]
-                )
+                val.parse_mode = DefaultValue.get_value(val.parse_mode)
             elif key == 'media' and isinstance(val, list):
                 for media in val:
                     media.parse_mode = DefaultValue.get_value(media.parse_mode)

diff --git a/telegram/_files/_basemedium.py b/telegram/_files/_basemedium.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015-2021
+# Leandro Toledo de Souza <devs@python-telegram-bot.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
+"""Common base class for media objects"""
+from typing import TYPE_CHECKING
+
+from telegram import TelegramObject
+from telegram._utils.defaultvalue import DEFAULT_NONE
+from telegram._utils.types import JSONDict, ODVInput
+
+if TYPE_CHECKING:
+    from telegram import Bot, File
+
+
+class _BaseMedium(TelegramObject):
+    """Base class for objects representing the various media file types.
+    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.
+
+    Args:
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
+        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.
+        file_size (:obj:`int`, optional): File size.
+        bot (:class:`telegram.Bot`, optional): The Bot to use for instance methods.
+
+    Attributes:
+        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.
+        file_size (:obj:`int`): Optional. File size.
+        bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
+
+    """
+
+    __slots__ = ('bot', 'file_id', 'file_size', 'file_unique_id')
+
+    def __init__(
+        self, file_id: str, file_unique_id: str, file_size: int = None, bot: 'Bot' = None
+    ):
+        # Required
+        self.file_id: str = str(file_id)
+        self.file_unique_id = str(file_unique_id)
+        # Optionals
+        self.file_size = file_size
+        self.bot = bot
+
+        self._id_attrs = (self.file_unique_id,)
+
+    def get_file(
+        self, timeout: ODVInput[float] = DEFAULT_NONE, api_kwargs: JSONDict = None
+    ) -> 'File':
+        """Convenience wrapper over :attr:`telegram.Bot.get_file`
+
+        For the documentation of the arguments, please see :meth:`telegram.Bot.get_file`.
+
+        Returns:
+            :class:`telegram.File`
+
+        Raises:
+            :class:`telegram.error.TelegramError`
+
+        """
+        return self.bot.get_file(file_id=self.file_id, timeout=timeout, api_kwargs=api_kwargs)
diff --git a/telegram/_files/_basethumbedmedium.py b/telegram/_files/_basethumbedmedium.py
@@ -0,0 +1,85 @@
+#!/usr/bin/env python
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015-2021
+# Leandro Toledo de Souza <devs@python-telegram-bot.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
+"""Common base class for media objects with thumbnails"""
+from typing import TYPE_CHECKING, TypeVar, Type, Optional
+
+from telegram import PhotoSize
+from telegram._files._basemedium import _BaseMedium
+from telegram._utils.types import JSONDict
+
+if TYPE_CHECKING:
+    from telegram import Bot
+
+ThumbedMT = TypeVar('ThumbedMT', bound='_BaseThumbedMedium', covariant=True)
+
+
+class _BaseThumbedMedium(_BaseMedium):
+    """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.
+
+    Args:
+        file_id (:obj:`str`): Identifier for this file, which can be used to download
+            or reuse the file.
+        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.
+        file_size (:obj:`int`, optional): File size.
+        thumb (:class:`telegram.PhotoSize`, optional): Thumbnail as defined by sender.
+        bot (:class:`telegram.Bot`, optional): The Bot to use for instance methods.
+
+    Attributes:
+        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.
+        file_size (:obj:`int`): Optional. File size.
+        thumb (:class:`telegram.PhotoSize`): Optional. Thumbnail as defined by sender.
+        bot (:class:`telegram.Bot`): Optional. The Bot to use for instance methods.
+
+    """
+
+    __slots__ = ('thumb',)
+
+    def __init__(
+        self,
+        file_id: str,
+        file_unique_id: str,
+        file_size: int = None,
+        thumb: PhotoSize = None,
+        bot: 'Bot' = None,
+    ):
+        super().__init__(
+            file_id=file_id, file_unique_id=file_unique_id, file_size=file_size, bot=bot
+        )
+        self.thumb = thumb
+
+    @classmethod
+    def de_json(cls: Type[ThumbedMT], data: Optional[JSONDict], bot: 'Bot') -> Optional[ThumbedMT]:
+        """See :meth:`telegram.TelegramObject.de_json`."""
+        data = cls._parse_data(data)
+
+        if not data:
+            return None
+
+        data['thumb'] = PhotoSize.de_json(data.get('thumb'), bot)
+
+        return cls(bot=bot, **data)
diff --git a/telegram/_files/animation.py b/telegram/_files/animation.py
@@ -17,17 +17,16 @@
 # You should have received a copy of the GNU Lesser Public License
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 """This module contains an object that represents a Telegram Animation."""
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
-from telegram import PhotoSize, TelegramObject
-from telegram._utils.defaultvalue import DEFAULT_NONE
-from telegram._utils.types import JSONDict, ODVInput
+from telegram import PhotoSize
+from telegram._files._basethumbedmedium import _BaseThumbedMedium
 
 if TYPE_CHECKING:
-    from telegram import Bot, File
+    from telegram import Bot
 
 
-class Animation(TelegramObject):
+class Animation(_BaseThumbedMedium):
     """This object represents an animation file (GIF or H.264/MPEG-4 AVC video without sound).
 
     Objects of this class are comparable in terms of equality. Two objects of this class are
@@ -65,18 +64,7 @@ class Animation(TelegramObject):
 
     """
 
-    __slots__ = (
-        'bot',
-        'width',
-        'file_id',
-        'file_size',
-        'file_name',
-        'thumb',
-        'duration',
-        'mime_type',
-        'height',
-        'file_unique_id',
-    )
+    __slots__ = ('duration', 'height', 'file_name', 'mime_type', 'width')
 
     def __init__(
         self,
@@ -92,45 +80,17 @@ def __init__(
         bot: 'Bot' = None,
         **_kwargs: Any,
     ):
+        super().__init__(
+            file_id=file_id,
+            file_unique_id=file_unique_id,
+            file_size=file_size,
+            thumb=thumb,
+            bot=bot,
+        )
         # Required
-        self.file_id = str(file_id)
-        self.file_unique_id = str(file_unique_id)
         self.width = int(width)
         self.height = int(height)
         self.duration = duration
-        # Optionals
-        self.thumb = thumb
-        self.file_name = file_name
+        # Optional
         self.mime_type = mime_type
-        self.file_size = file_size
-        self.bot = bot
-
-        self._id_attrs = (self.file_unique_id,)
-
-    @classmethod
-    def de_json(cls, data: Optional[JSONDict], bot: 'Bot') -> Optional['Animation']:
-        """See :meth:`telegram.TelegramObject.de_json`."""
-        data = cls._parse_data(data)
-
-        if not data:
-            return None
-
-        data['thumb'] = PhotoSize.de_json(data.get('thumb'), bot)
-
-        return cls(bot=bot, **data)
-
-    def get_file(
-        self, timeout: ODVInput[float] = DEFAULT_NONE, api_kwargs: JSONDict = None
-    ) -> 'File':
-        """Convenience wrapper over :attr:`telegram.Bot.get_file`
-
-        For the documentation of the arguments, please see :meth:`telegram.Bot.get_file`.
-
-        Returns:
-            :class:`telegram.File`
-
-        Raises:
-            :class:`telegram.error.TelegramError`
-
-        """
-        return self.bot.get_file(file_id=self.file_id, timeout=timeout, api_kwargs=api_kwargs)
+        self.file_name = file_name