Merge branch 'use-timeout'

CHANGES.rst

@@ -1,3 +1,9 @@
+**2016-07-04**
+
+*Released 4.3.2*
+
+- Fix: Use ``timeout`` parameter in all API methods
+
 **2016-06-29**
 
 *Released 4.3.1*

telegram/__init__.py

@@ -82,7 +82,7 @@ from .update import Update
 from .bot import Bot
 
 __author__ = 'devs@python-telegram-bot.org'
-__version__ = '4.3.1'
+__version__ = '4.3.2'
 __all__ = ['Audio', 'Bot', 'Chat', 'ChatMember', 'ChatAction', 'ChosenInlineResult',
            'CallbackQuery', 'Contact', 'Document', 'Emoji', 'File', 'ForceReply',
            'InlineKeyboardButton', 'InlineKeyboardMarkup', 'InlineQuery', 'InlineQueryResult',

telegram/utils/request.py

@@ -171,7 +171,8 @@ def post(url, data, timeout=None):
         result = _request_wrapper('POST',
                                   url,
                                   body=data.encode(),
-                                  headers={'Content-Type': 'application/json'})
+                                  headers={'Content-Type': 'application/json'},
+                                  **urlopen_kwargs)
 
     return _parse(result)