set timeout for post message with file object (python-telegram-bot#486)

anton-tagunov · tsnoam · commit 48bcc3129a03 · 2016-12-29T12:01:58.000+02:00
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -9,6 +9,7 @@ Contributors
 The following wonderful people contributed directly or indirectly to this project:
 
 - `Avanatiker <https://github.com/Avanatiker>`_
+- `Anton Tagunov <https://github.com/anton-tagunov>`_
 - `Balduro <https://github.com/Balduro>`_
 - `bimmlerd <https://github.com/bimmlerd>`_
 - `Eli Gao <https://github.com/eligao>`_
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -196,7 +196,11 @@ def post(self, url, data, timeout=None):
 
         if InputFile.is_inputfile(data):
             data = InputFile(data)
-            result = self._request_wrapper('POST', url, body=data.to_form(), headers=data.headers)
+            result = self._request_wrapper('POST',
+                                           url,
+                                           body=data.to_form(),
+                                           headers=data.headers,
+                                           **urlopen_kwargs)
         else:
             data = json.dumps(data)
             result = self._request_wrapper(
