Remove Incorrect Warning About Defaults and ExtBot (python-telegram-bot#2553)

Bibo-Joshi · web-flow · commit ac4768155f6d · 2021-06-10T12:03:44.000+02:00
* Don't throw warning when passing defaults to ExtBot

* Review
diff --git a/telegram/ext/extbot.py b/telegram/ext/extbot.py
@@ -101,8 +101,9 @@ def __init__(
             request=request,
             private_key=private_key,
             private_key_password=private_key_password,
-            defaults=defaults,
         )
+        # We don't pass this to super().__init__ to avoid the deprecation warning
+        self.defaults = defaults
 
         # set up callback_data
         if not isinstance(arbitrary_callback_data, bool):
diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -53,7 +53,7 @@
     PollOption,
 )
 from telegram.constants import MAX_INLINE_QUERY_RESULTS
-from telegram.ext import ExtBot
+from telegram.ext import ExtBot, Defaults
 from telegram.error import BadRequest, InvalidToken, NetworkError, RetryAfter
 from telegram.ext.callbackdatacache import InvalidCallbackData
 from telegram.utils.helpers import (
@@ -65,6 +65,16 @@
 from tests.bots import FALLBACKS
 
 
+class ExtBotSubClass(ExtBot):
+    # used for test_defaults_warning below
+    pass
+
+
+class BotSubClass(Bot):
+    # used for test_defaults_warning below
+    pass
+
+
 @pytest.fixture(scope='class')
 def message(bot, chat_id):
     to_reply_to = bot.send_message(
@@ -2373,3 +2383,15 @@ def post(*args, **kwargs):
             bot.arbitrary_callback_data = False
             bot.callback_data_cache.clear_callback_data()
             bot.callback_data_cache.clear_callback_queries()
+
+    @pytest.mark.parametrize(
+        'cls,warn', [(Bot, True), (BotSubClass, True), (ExtBot, False), (ExtBotSubClass, False)]
+    )
+    def test_defaults_warning(self, bot, recwarn, cls, warn):
+        defaults = Defaults()
+        cls(bot.token, defaults=defaults)
+        if warn:
+            assert len(recwarn) == 1
+            assert 'Passing Defaults to telegram.Bot is deprecated.' in str(recwarn[-1].message)
+        else:
+            assert len(recwarn) == 0
