Skip to content

Commit c2cce40

Browse files
committed
Merge branch 'use-timeout'
2 parents 9fd298a + a2ed7b2 commit c2cce40

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

CHANGES.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
**2016-07-04**
2+
3+
*Released 4.3.2*
4+
5+
- Fix: Use ``timeout`` parameter in all API methods
6+
17
**2016-06-29**
28

39
*Released 4.3.1*

telegram/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
from .bot import Bot
8383

8484
__author__ = 'devs@python-telegram-bot.org'
85-
__version__ = '4.3.1'
85+
__version__ = '4.3.2'
8686
__all__ = ['Audio', 'Bot', 'Chat', 'ChatMember', 'ChatAction', 'ChosenInlineResult',
8787
'CallbackQuery', 'Contact', 'Document', 'Emoji', 'File', 'ForceReply',
8888
'InlineKeyboardButton', 'InlineKeyboardMarkup', 'InlineQuery', 'InlineQueryResult',

telegram/utils/request.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ def post(url, data, timeout=None):
171171
result = _request_wrapper('POST',
172172
url,
173173
body=data.encode(),
174-
headers={'Content-Type': 'application/json'})
174+
headers={'Content-Type': 'application/json'},
175+
**urlopen_kwargs)
175176

176177
return _parse(result)
177178

0 commit comments

Comments
 (0)