saintbyte
diff --git a/‎telegram/bot.py‎
Lines changed: 31 additions & 18 deletions b/‎telegram/bot.py‎
Lines changed: 31 additions & 18 deletions
diff --git a/‎telegram/utils/request.py‎
Lines changed: 21 additions & 9 deletions b/‎telegram/utils/request.py‎
Lines changed: 21 additions & 9 deletions
@@ -142,28 +142,38 @@ def decorator(self, *args, **kwargs):
             decorator
             """
             url, data = func(self, *args, **kwargs)
+            return Bot._post_message(url, data, kwargs)
+        return decorator
 
-            if not data.get('chat_id'):
-                raise TelegramError('Invalid chat_id')
+    @staticmethod
+    def _post_message(url, data, kwargs, timeout=None, network_delay=2.):
+        """Posts a message to the telegram servers.
 
-            if kwargs.get('reply_to_message_id'):
-                reply_to_message_id = kwargs.get('reply_to_message_id')
-                data['reply_to_message_id'] = reply_to_message_id
+        Returns:
+            telegram.Message
 
-            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 not data.get('chat_id'):
+            raise TelegramError('Invalid chat_id')
 
-            result = request.post(url, data)
+        if kwargs.get('reply_to_message_id'):
+            reply_to_message_id = kwargs.get('reply_to_message_id')
+            data['reply_to_message_id'] = reply_to_message_id
 
-            if result is True:
-                return result
+        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
 
-            return Message.de_json(result)
-        return decorator
+        result = request.post(url, data, timeout=timeout,
+                              network_delay=network_delay)
+
+        if result is True:
+            return result
+
+        return Message.de_json(result)
 
     @log
     def getMe(self):
@@ -430,12 +440,12 @@ def sendSticker(self,
         return url, data
 
     @log
-    @message
     def sendVideo(self,
                   chat_id,
                   video,
                   duration=None,
                   caption=None,
+                  timeout=None,
                   **kwargs):
         """Use this method to send video files, Telegram clients support mp4
         videos (other formats may be sent as telegram.Document).
@@ -452,6 +462,9 @@ def sendVideo(self,
           caption:
             Video caption (may also be used when resending videos by file_id).
             [Optional]
+          timeout:
+            float. If this value is specified, use it as the definitive timeout
+            (in seconds) for urlopen() operations. [Optional]
           reply_to_message_id:
             If the message is a reply, ID of the original message. [Optional]
           reply_markup:
@@ -473,7 +486,7 @@ def sendVideo(self,
         if caption:
             data['caption'] = caption
 
-        return url, data
+        return self._post_message(url, data, kwargs, timeout=timeout)
 
     @log
     @message
 
@@ -127,27 +127,37 @@ def get(url):
 @_try_except_req
 def post(url,
          data,
+         timeout=None,
          network_delay=2.):
     """Request an URL.
     Args:
       url:
         The web location we want to retrieve.
       data:
         A dict of (str, unicode) key/value pairs.
+      timeout:
+        float. If this value is specified, use it as the definitive timeout (in
+        seconds) for urlopen() operations. [Optional]
       network_delay:
-        Additional timeout in seconds to allow the response from Telegram to
-        take some time.
+        float. If using the timeout specified in `data` (which is a timeout for
+        the Telegram servers operation), then `network_delay` as an extra delay
+        (in seconds) to compensate for network latency.
+        default: 2 [Optional]
+
+    Notes:
+      If neither `timeout` nor `data['timeout']` is specified. The underlying
+      defaults are used.
 
     Returns:
       A JSON object.
+
     """
+    urlopen_kwargs = {}
 
-    # Add time to the timeout of urlopen to allow data to be transferred over
-    # the network.
-    if 'timeout' in data:
-        timeout = data['timeout'] + network_delay
-    else:
-        timeout = None
+    if timeout is not None:
+        urlopen_kwargs['timeout'] = timeout
+    elif 'timeout' in data:
+        urlopen_kwargs['timeout'] = data['timeout'] + network_delay
 
     if InputFile.is_inputfile(data):
         data = InputFile(data)
@@ -160,7 +170,9 @@ def post(url,
                           data=data.encode(),
                           headers={'Content-Type': 'application/json'})
 
-    result = urlopen(request, timeout=timeout).read()
+    with urlopen(request, **urlopen_kwargs) as handle:
+        result = handle.read()
+
     return _parse(result)