OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-12-23 06:50:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'use-timeout'

Browse source
This commit is contained in:
Jannes Höke 2016-07-04 21:56:26 +02:00
commit c2cce40299
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.rst
View file

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

2
telegram/__init__.py
View file

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

3
telegram/utils/request.py
View file

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