Remove message decorator to fix default timeouts.

jsmnbom · jsmnbom · commit 780ea32b1c70 · 2018-07-09T16:06:30.000+02:00
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -65,33 +65,6 @@ def decorator(self, *args, **kwargs):
     return decorator
 
 
-def message(func):
-    @functools.wraps(func)
-    def decorator(self, *args, **kwargs):
-        url, data = func(self, *args, **kwargs)
-        if kwargs.get('reply_to_message_id'):
-            data['reply_to_message_id'] = kwargs.get('reply_to_message_id')
-
-        if kwargs.get('disable_notification'):
-            data['disable_notification'] = kwargs.get('disable_notification')
-
-        if kwargs.get('reply_markup'):
-            reply_markup = kwargs.get('reply_markup')
-            if isinstance(reply_markup, ReplyMarkup):
-                data['reply_markup'] = reply_markup.to_json()
-            else:
-                data['reply_markup'] = reply_markup
-
-        result = self._request.post(url, data, timeout=kwargs.get('timeout'))
-
-        if result is True:
-            return result
-
-        return Message.de_json(result, self)
-
-    return decorator
-
-
 class Bot(TelegramObject):
     """This object represents a Telegram Bot.
 
@@ -119,6 +92,27 @@ def __init__(self, token, base_url=None, base_file_url=None, request=None):
         self._request = request or Request()
         self.logger = logging.getLogger(__name__)
 
+    def message(self, url, data, **kwargs):
+        if kwargs.get('reply_to_message_id'):
+            data['reply_to_message_id'] = kwargs.get('reply_to_message_id')
+
+        if kwargs.get('disable_notification'):
+            data['disable_notification'] = kwargs.get('disable_notification')
+
+        if kwargs.get('reply_markup'):
+            reply_markup = kwargs.get('reply_markup')
+            if isinstance(reply_markup, ReplyMarkup):
+                data['reply_markup'] = reply_markup.to_json()
+            else:
+                data['reply_markup'] = reply_markup
+
+        result = self._request.post(url, data, timeout=kwargs.get('timeout'))
+
+        if result is True:
+            return result
+
+        return Message.de_json(result, self)
+
     @property
     def request(self):
         return self._request
@@ -195,7 +189,6 @@ def get_me(self, timeout=None, **kwargs):
         return self.bot
 
     @log
-    @message
     def send_message(self,
                      chat_id,
                      text,
@@ -246,7 +239,7 @@ def send_message(self,
         if disable_web_page_preview:
             data['disable_web_page_preview'] = disable_web_page_preview
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
     def delete_message(self, chat_id, message_id, timeout=None, **kwargs):
@@ -285,7 +278,6 @@ def delete_message(self, chat_id, message_id, timeout=None, **kwargs):
         return result
 
     @log
-    @message
     def forward_message(self,
                         chat_id,
                         from_chat_id,
@@ -327,10 +319,9 @@ def forward_message(self,
         if message_id:
             data['message_id'] = message_id
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def send_photo(self,
                    chat_id,
                    photo,
@@ -389,10 +380,9 @@ def send_photo(self,
         if parse_mode:
             data['parse_mode'] = parse_mode
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def send_audio(self,
                    chat_id,
                    audio,
@@ -468,10 +458,9 @@ def send_audio(self,
         if parse_mode:
             data['parse_mode'] = parse_mode
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def send_document(self,
                       chat_id,
                       document,
@@ -535,10 +524,9 @@ def send_document(self,
         if parse_mode:
             data['parse_mode'] = parse_mode
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def send_sticker(self,
                      chat_id,
                      sticker,
@@ -585,10 +573,9 @@ def send_sticker(self,
 
         data = {'chat_id': chat_id, 'sticker': sticker}
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def send_video(self,
                    chat_id,
                    video,
@@ -666,10 +653,9 @@ def send_video(self,
         if height:
             data['height'] = height
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def send_voice(self,
                    chat_id,
                    voice,
@@ -734,10 +720,9 @@ def send_voice(self,
         if parse_mode:
             data['parse_mode'] = parse_mode
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def send_video_note(self,
                         chat_id,
                         video_note,
@@ -793,7 +778,7 @@ def send_video_note(self,
         if length is not None:
             data['length'] = length
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
     def send_media_group(self,
@@ -841,7 +826,6 @@ def send_media_group(self,
         return [Message.de_json(res, self) for res in result]
 
     @log
-    @message
     def send_location(self,
                       chat_id,
                       latitude=None,
@@ -904,10 +888,9 @@ def send_location(self,
         if live_period:
             data['live_period'] = live_period
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def edit_message_live_location(self,
                                    chat_id=None,
                                    message_id=None,
@@ -916,6 +899,7 @@ def edit_message_live_location(self,
                                    longitude=None,
                                    location=None,
                                    reply_markup=None,
+                                   timeout=None,
                                    **kwargs):
         """Use this method to edit live location messages sent by the bot or via the bot
         (for inline bots). A location can be edited until its :attr:`live_period` expires or
@@ -967,15 +951,15 @@ def edit_message_live_location(self,
         if inline_message_id:
             data['inline_message_id'] = inline_message_id
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def stop_message_live_location(self,
                                    chat_id=None,
                                    message_id=None,
                                    inline_message_id=None,
                                    reply_markup=None,
+                                   timeout=None,
                                    **kwargs):
         """Use this method to stop updating a live location message sent by the bot or via the bot
         (for inline bots) before live_period expires.
@@ -1009,10 +993,9 @@ def stop_message_live_location(self,
         if inline_message_id:
             data['inline_message_id'] = inline_message_id
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def send_venue(self,
                    chat_id,
                    latitude=None,
@@ -1084,10 +1067,9 @@ def send_venue(self,
         if foursquare_id:
             data['foursquare_id'] = foursquare_id
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def send_contact(self,
                      chat_id,
                      phone_number=None,
@@ -1147,10 +1129,9 @@ def send_contact(self,
         if last_name:
             data['last_name'] = last_name
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def send_game(self,
                   chat_id,
                   game_short_name,
@@ -1189,7 +1170,7 @@ def send_game(self,
 
         data = {'chat_id': chat_id, 'game_short_name': game_short_name}
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
     def send_chat_action(self, chat_id, action, timeout=None, **kwargs):
@@ -1523,7 +1504,6 @@ def answer_callback_query(self,
         return result
 
     @log
-    @message
     def edit_message_text(self,
                           text,
                           chat_id=None,
@@ -1582,10 +1562,9 @@ def edit_message_text(self,
         if disable_web_page_preview:
             data['disable_web_page_preview'] = disable_web_page_preview
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def edit_message_caption(self,
                              chat_id=None,
                              message_id=None,
@@ -1646,10 +1625,9 @@ def edit_message_caption(self,
         if inline_message_id:
             data['inline_message_id'] = inline_message_id
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
-    @message
     def edit_message_reply_markup(self,
                                   chat_id=None,
                                   message_id=None,
@@ -1700,7 +1678,7 @@ def edit_message_reply_markup(self,
         if inline_message_id:
             data['inline_message_id'] = inline_message_id
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
     def get_updates(self,
@@ -2117,7 +2095,6 @@ def get_webhook_info(self, timeout=None, **kwargs):
         return WebhookInfo.de_json(result, self)
 
     @log
-    @message
     def set_game_score(self,
                        user_id,
                        score,
@@ -2176,7 +2153,7 @@ def set_game_score(self,
         if disable_edit_message is not None:
             data['disable_edit_message'] = disable_edit_message
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
     def get_game_high_scores(self,
@@ -2227,7 +2204,6 @@ def get_game_high_scores(self,
         return [GameHighScore.de_json(hs, self) for hs in result]
 
     @log
-    @message
     def send_invoice(self,
                      chat_id,
                      title,
@@ -2351,7 +2327,7 @@ def send_invoice(self,
         if send_email_to_provider is not None:
             data['send_email_to_provider'] = send_email_to_provider
 
-        return url, data
+        return self.message(url, data, timeout=timeout, **kwargs)
 
     @log
     def answer_shipping_query(self,
diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -619,7 +619,7 @@ def test_error_pin_unpin_message(self, bot, message):
     # set_sticker_position_in_set and delete_sticker_from_set are tested in the
     # test_sticker module.
 
-    def test_timeout_propagation(self, monkeypatch, bot, chat_id):
+    def test_timeout_propagation_explicit(self, monkeypatch, bot, chat_id):
         class OkException(Exception):
             pass
 
@@ -633,3 +633,16 @@ def post(*args, **kwargs):
 
         with pytest.raises(OkException):
             bot.send_photo(chat_id, open('tests/data/telegram.jpg', 'rb'), timeout=timeout)
+
+    def test_timeout_propagation_implicit(self, monkeypatch, bot, chat_id):
+        class OkException(Exception):
+            pass
+
+        def post(*args, **kwargs):
+            if kwargs.get('timeout') == 20:
+                raise OkException
+
+        monkeypatch.setattr('telegram.utils.request.Request.post', post)
+
+        with pytest.raises(OkException):
+            bot.send_photo(chat_id, open('tests/data/telegram.jpg', 'rb'))
