python-telegram-bot · Poolitzer · Oct 21, 2021 · Oct 5, 2021 · Oct 7, 2021 · Oct 7, 2021
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -114,5 +114,6 @@ The following wonderful people contributed directly or indirectly to this projec
 - `wjt <https://github.com/wjt>`_
 - `zeroone2numeral2 <https://github.com/zeroone2numeral2>`_
 - `zeshuaro <https://github.com/zeshuaro>`_
+- `zpavloudis <https://github.com/zpavloudis>`_
 
 Please add yourself here alphabetically when you submit your first pull request.
diff --git a/setup.cfg b/setup.cfg
@@ -60,7 +60,7 @@ show_error_codes = True
 ignore_errors = True
 
 # Disable strict optional for telegram objects with class methods
-# We don't want to clutter the code with 'if self.bot is None: raise RuntimeError()'
+# We don't want to clutter the code with 'if self.text is None: raise RuntimeError()'
 [mypy-telegram._callbackquery,telegram._chat,telegram._message,telegram._user,telegram._files.*,telegram._inline.inlinequery,telegram._payment.precheckoutquery,telegram._payment.shippingquery,telegram._passport.passportdata,telegram._passport.credentials,telegram._passport.passportfile,telegram.ext.filters]
 strict_optional = False
 

diff --git a/telegram/_bot.py b/telegram/_bot.py
@@ -151,7 +151,7 @@ class Bot(TelegramObject):
         'base_url',
         'base_file_url',
         'private_key',
-        '_bot',
+        '_bot_user',
         '_request',
         'logger',
     )
@@ -169,7 +169,7 @@ def __init__(
 
         self.base_url = base_url + self.token
         self.base_file_url = base_file_url + self.token
-        self._bot: Optional[User] = None
+        self._bot_user: Optional[User] = None
         self._request = request or Request()
         self.private_key = None
         self.logger = logging.getLogger(__name__)
@@ -322,9 +322,9 @@ def _validate_token(token: str) -> str:
     @property
     def bot(self) -> User:
         """:class:`telegram.User`: User instance for the bot as returned by :meth:`get_me`."""
-        if self._bot is None:
-            self._bot = self.get_me()
-        return self._bot
+        if self._bot_user is None:
+            self._bot_user = self.get_me()
+        return self._bot_user
 
     @property
     def id(self) -> int:  # pylint: disable=invalid-name
@@ -392,9 +392,9 @@ def get_me(self, timeout: ODVInput[float] = DEFAULT_NONE, api_kwargs: JSONDict =
         """
         result = self._post('getMe', timeout=timeout, api_kwargs=api_kwargs)
 
-        self._bot = User.de_json(result, self)  # type: ignore[return-value, arg-type]
+        self._bot_user = User.de_json(result, self)  # type: ignore[return-value, arg-type]
 
-        return self._bot  # type: ignore[return-value]
+        return self._bot_user  # type: ignore[return-value]
 
     @_log
     def send_message(

diff --git a/telegram/_callbackquery.py b/telegram/_callbackquery.py
@@ -93,7 +93,6 @@ class CallbackQuery(TelegramObject):
     """
 
     __slots__ = (
-        'bot',
         'game_short_name',
         'message',
         'chat_instance',
@@ -125,7 +124,7 @@ def __init__(
         self.inline_message_id = inline_message_id
         self.game_short_name = game_short_name
 
-        self.bot = bot
+        self.set_bot(bot)
 
         self._id_attrs = (self.id,)
 
@@ -162,7 +161,7 @@ def answer(
             :obj:`bool`: On success, :obj:`True` is returned.
 
         """
-        return self.bot.answer_callback_query(
+        return self.get_bot().answer_callback_query(
             callback_query_id=self.id,
             text=text,
             show_alert=show_alert,
@@ -200,7 +199,7 @@ def edit_message_text(
 
         """
         if self.inline_message_id:
-            return self.bot.edit_message_text(
+            return self.get_bot().edit_message_text(
                 inline_message_id=self.inline_message_id,
                 text=text,
                 parse_mode=parse_mode,
@@ -250,7 +249,7 @@ def edit_message_caption(
 
         """
         if self.inline_message_id:
-            return self.bot.edit_message_caption(
+            return self.get_bot().edit_message_caption(
                 caption=caption,
                 inline_message_id=self.inline_message_id,
                 reply_markup=reply_markup,
@@ -303,7 +302,7 @@ def edit_message_reply_markup(
 
         """
         if self.inline_message_id:
-            return self.bot.edit_message_reply_markup(
+            return self.get_bot().edit_message_reply_markup(
                 reply_markup=reply_markup,
                 inline_message_id=self.inline_message_id,
                 timeout=timeout,
@@ -342,7 +341,7 @@ def edit_message_media(
 
         """
         if self.inline_message_id:
-            return self.bot.edit_message_media(
+            return self.get_bot().edit_message_media(
                 inline_message_id=self.inline_message_id,
                 media=media,
                 reply_markup=reply_markup,
@@ -391,7 +390,7 @@ def edit_message_live_location(
 
         """
         if self.inline_message_id:
-            return self.bot.edit_message_live_location(
+            return self.get_bot().edit_message_live_location(
                 inline_message_id=self.inline_message_id,
                 latitude=latitude,
                 longitude=longitude,
@@ -444,7 +443,7 @@ def stop_message_live_location(
 
         """
         if self.inline_message_id:
-            return self.bot.stop_message_live_location(
+            return self.get_bot().stop_message_live_location(
                 inline_message_id=self.inline_message_id,
                 reply_markup=reply_markup,
                 timeout=timeout,
@@ -485,7 +484,7 @@ def set_game_score(
 
         """
         if self.inline_message_id:
-            return self.bot.set_game_score(
+            return self.get_bot().set_game_score(
                 inline_message_id=self.inline_message_id,
                 user_id=user_id,
                 score=score,
@@ -528,7 +527,7 @@ def get_game_high_scores(
 
         """
         if self.inline_message_id:
-            return self.bot.get_game_high_scores(
+            return self.get_bot().get_game_high_scores(
                 inline_message_id=self.inline_message_id,
                 user_id=user_id,
                 timeout=timeout,