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 2025-03-16 12:25:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

don't send network_delay to telegram servers

Browse source
This commit is contained in:
Jannes Höke 2015-11-10 22:40:19 +01:00
parent 245f5abc45
commit 61dac76bee
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
telegram/bot.py
View file

@ -650,7 +650,7 @@ class Bot(TelegramObject):
offset=None,
limit=100,
timeout=0,
network_delay=2):
network_delay=2.):
"""Use this method to receive incoming updates using long polling.
Args:
@ -685,10 +685,8 @@ class Bot(TelegramObject):
data['limit'] = limit
if timeout:
data['timeout'] = timeout
if network_delay:
data['network_delay'] = network_delay
result = request.post(url, data)
result = request.post(url, data, network_delay=network_delay)
if result:
self.logger.info(

12
telegram/utils/request.py
View file

@ -67,13 +67,17 @@ def get(url):
def post(url,
data):
data,
network_delay=2.):
"""Request an URL.
Args:
url:
The web location we want to retrieve.
data:
A dict of (str, unicode) key/value pairs.
network_delay:
Additional timeout in seconds to allow the response from Telegram to
take some time.
Returns:
A JSON object.
@ -82,10 +86,10 @@ def post(url,
# Add time to the timeout of urlopen to allow data to be transferred over
# the network.
if 'timeout' in data:
if 'network_delay' in data:
timeout = data['timeout'] + data['network_delay']
if network_delay:
timeout = data['timeout'] + network_delay
else:
timeout = data['timeout'] + 2.
timeout = data['timeout']
else:
timeout = None