Sane default for sending files timeout

tsnoam · tsnoam · commit 2b930c221dcb · 2017-03-11T16:23:43.000+02:00
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -129,31 +129,33 @@ def decorator(self, *args, **kwargs):
 
         return decorator
 
-    def message(func):
+    def _message_wrapper(self, url, data, *args, **kwargs):
+        if kwargs.get('reply_to_message_id'):
+            data['reply_to_message_id'] = kwargs.get('reply_to_message_id')
 
-        @functools.wraps(func)
-        def decorator(self, *args, **kwargs):
-            url, data = func(self, *args, **kwargs)
+        if kwargs.get('disable_notification'):
+            data['disable_notification'] = kwargs.get('disable_notification')
 
-            if kwargs.get('reply_to_message_id'):
-                data['reply_to_message_id'] = kwargs.get('reply_to_message_id')
+        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
 
-            if kwargs.get('disable_notification'):
-                data['disable_notification'] = kwargs.get('disable_notification')
+        result = self._request.post(url, data, timeout=kwargs.get('timeout'))
 
-            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
+        if result is True:
+            return result
 
-            result = self._request.post(url, data, timeout=kwargs.get('timeout'))
+        return Message.de_json(result, self)
 
-            if result is True:
-                return result
+    def message(func):
 
-            return Message.de_json(result, self)
+        @functools.wraps(func)
+        def decorator(self, *args, **kwargs):
+            url, data = func(self, *args, **kwargs)
+            return Bot._message_wrapper(self, url, data, *args, **kwargs)
 
         return decorator
 
@@ -283,15 +285,14 @@ def forwardMessage(self,
         return url, data
 
     @log
-    @message
     def sendPhoto(self,
                   chat_id,
                   photo,
                   caption=None,
                   disable_notification=False,
                   reply_to_message_id=None,
                   reply_markup=None,
-                  timeout=None,
+                  timeout=20.,
                   **kwargs):
         """Use this method to send photos.
 
@@ -308,9 +309,7 @@ def sendPhoto(self,
             reply_markup (Optional[:class:`telegram.ReplyMarkup`]): Additional interface options. A
                 JSON-serialized object for an inline keyboard, custom reply keyboard, instructions
                 to remove reply keyboard or to force a reply from the user.
-            timeout (Optional[int|float]): 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).
+            timeout (Optional[int|float]): Send file timeout (default: 20 seconds).
             **kwargs (dict): Arbitrary keyword arguments.
 
         Returns:
@@ -327,10 +326,19 @@ def sendPhoto(self,
         if caption:
             data['caption'] = caption
 
-        return url, data
+        return self._message_wrapper(
+            url,
+            data,
+            chat_id=chat_id,
+            photo=photo,
+            caption=caption,
+            disable_notification=disable_notification,
+            reply_to_message_id=reply_to_message_id,
+            reply_markup=reply_markup,
+            timeout=timeout,
+            **kwargs)
 
     @log
-    @message
     def sendAudio(self,
                   chat_id,
                   audio,
@@ -341,7 +349,7 @@ def sendAudio(self,
                   disable_notification=False,
                   reply_to_message_id=None,
                   reply_markup=None,
-                  timeout=None,
+                  timeout=20.,
                   **kwargs):
         """Use this method to send audio files, if you want Telegram clients to
         display them in the music player. Your audio must be in an .mp3 format.
@@ -370,9 +378,7 @@ def sendAudio(self,
             reply_markup (Optional[:class:`telegram.ReplyMarkup`]): Additional interface options. A
                 JSON-serialized object for an inline keyboard, custom reply keyboard, instructions
                 to remove reply keyboard or to force a reply from the user.
-            timeout (Optional[int|float]): 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).
+            timeout (Optional[int|float]): Send file timeout (default: 20 seconds).
             **kwargs (dict): Arbitrary keyword arguments.
 
         Returns:
@@ -395,10 +401,22 @@ def sendAudio(self,
         if caption:
             data['caption'] = caption
 
-        return url, data
+        return self._message_wrapper(
+            url,
+            data,
+            chat_id=chat_id,
+            audio=audio,
+            duration=duration,
+            performer=performer,
+            title=title,
+            caption=caption,
+            disable_notification=disable_notification,
+            reply_to_message_id=reply_to_message_id,
+            reply_markup=reply_markup,
+            timeout=20.,
+            **kwargs)
 
     @log
-    @message
     def sendDocument(self,
                      chat_id,
                      document,
@@ -407,7 +425,7 @@ def sendDocument(self,
                      disable_notification=False,
                      reply_to_message_id=None,
                      reply_markup=None,
-                     timeout=None,
+                     timeout=20.,
                      **kwargs):
         """Use this method to send general files.
 
@@ -426,9 +444,7 @@ def sendDocument(self,
             reply_markup (Optional[:class:`telegram.ReplyMarkup`]): Additional interface options. A
                 JSON-serialized object for an inline keyboard, custom reply keyboard, instructions
                 to remove reply keyboard or to force a reply from the user.
-            timeout (Optional[int|float]): 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).
+            timeout (Optional[int|float]): Send file timeout (default: 20 seconds).
             **kwargs (dict): Arbitrary keyword arguments.
 
         Returns:
@@ -447,6 +463,18 @@ def sendDocument(self,
         if caption:
             data['caption'] = caption
 
+        self._message_wrapper(
+            url,
+            data,
+            chat_id=chat_id,
+            document=document,
+            filename=filename,
+            caption=caption,
+            disable_notification=disable_notification,
+            reply_to_message_id=reply_to_message_id,
+            reply_markup=reply_markup,
+            timeout=timeout,
+            **kwargs)
         return url, data
 
     @log
@@ -492,7 +520,6 @@ def sendSticker(self,
         return url, data
 
     @log
-    @message
     def sendVideo(self,
                   chat_id,
                   video,
@@ -501,7 +528,7 @@ def sendVideo(self,
                   disable_notification=False,
                   reply_to_message_id=None,
                   reply_markup=None,
-                  timeout=None,
+                  timeout=20.,
                   **kwargs):
         """Use this method to send video files, Telegram clients support mp4
         videos (other formats may be sent as telegram.Document).
@@ -521,9 +548,7 @@ def sendVideo(self,
             reply_markup (Optional[:class:`telegram.ReplyMarkup`]): Additional interface options. A
                 JSON-serialized object for an inline keyboard, custom reply keyboard, instructions
                 to remove reply keyboard or to force a reply from the user.
-            timeout (Optional[int|float]): 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).
+            timeout (Optional[int|float]): Send file timeout (default: 20 seconds).
 
         Returns:
             :class:`telegram.Message`: On success, instance representing the message posted.
@@ -541,10 +566,20 @@ def sendVideo(self,
         if caption:
             data['caption'] = caption
 
-        return url, data
+        return self._message_wrapper(
+            url,
+            data,
+            chat_id=chat_id,
+            video=video,
+            duration=duration,
+            caption=caption,
+            disable_notification=disable_notification,
+            reply_to_message_id=reply_to_message_id,
+            reply_markup=reply_markup,
+            timeout=timeout,
+            **kwargs)
 
     @log
-    @message
     def sendVoice(self,
                   chat_id,
                   voice,
@@ -553,7 +588,7 @@ def sendVoice(self,
                   disable_notification=False,
                   reply_to_message_id=None,
                   reply_markup=None,
-                  timeout=None,
+                  timeout=20.,
                   **kwargs):
         """Use this method to send audio files, if you want Telegram clients to display the file as
         a playable voice message. For this to work, your audio must be in an .ogg file encoded with
@@ -575,9 +610,7 @@ def sendVoice(self,
             reply_markup (Optional[:class:`telegram.ReplyMarkup`]): Additional interface options. A
                 JSON-serialized object for an inline keyboard, custom reply keyboard, instructions
                 to remove reply keyboard or to force a reply from the user.
-            timeout (Optional[int|float]): 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).
+            timeout (Optional[int|float]): Send file timeout (default: 20 seconds).
             **kwargs (dict): Arbitrary keyword arguments.
 
         Returns:
@@ -596,7 +629,18 @@ def sendVoice(self,
         if caption:
             data['caption'] = caption
 
-        return url, data
+        return self._message_wrapper(
+            url,
+            data,
+            chat_id=chat_id,
+            voice=voice,
+            duration=duration,
+            caption=caption,
+            disable_notification=disable_notification,
+            reply_to_message_id=reply_to_message_id,
+            reply_markup=reply_markup,
+            timeout=timeout,
+            **kwargs)
 
     @log
     @message
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -81,7 +81,7 @@ def __init__(self,
                 (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
             ],
             timeout=urllib3.Timeout(
-                connect=self._connect_timeout, read=read_timeout),)
+                connect=self._connect_timeout, read=read_timeout, total=None))
 
         # Set a proxy according to the following order:
         # * proxy defined in proxy_url (+ urllib3_proxy_kwargs)
