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-01-03 09:49:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Endorsing if empty or 0 or empty string and minor typo fix #232

Browse source
This commit is contained in:
Leandro Toledo 2016-04-18 20:18:32 -03:00
parent a98919a86e
commit 9a340d2ea9
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
telegram/bot.py
View file

@ -747,7 +747,7 @@ class Bot(TelegramObject):
def answerInlineQuery(self, def answerInlineQuery(self,
inline_query_id, inline_query_id,
results, results,
cache_time=None, cache_time=300,
is_personal=None, is_personal=None,
next_offset=None, next_offset=None,
switch_pm_text=None, switch_pm_text=None,
@ -801,7 +801,7 @@ class Bot(TelegramObject):
data['cache_time'] = int(cache_time) data['cache_time'] = int(cache_time)
if is_personal: if is_personal:
data['is_personal'] = bool(is_personal) data['is_personal'] = bool(is_personal)
if next_offset: if next_offset or next_offset == '':
data['next_offset'] = next_offset data['next_offset'] = next_offset
if switch_pm_text: if switch_pm_text:
data['switch_pm_text'] = switch_pm_text data['switch_pm_text'] = switch_pm_text
@ -935,7 +935,7 @@ class Bot(TelegramObject):
def answerCallbackQuery(self, def answerCallbackQuery(self,
callback_query_id, callback_query_id,
text=None, text=None,
show_alert=None): show_alert=False):
"""Use this method to send answers to callback queries sent from inline """Use this method to send answers to callback queries sent from inline
keyboards. The answer will be displayed to the user as a notification keyboards. The answer will be displayed to the user as a notification
at the top of the chat screen or as an alert. at the top of the chat screen or as an alert.
@ -1161,7 +1161,7 @@ class Bot(TelegramObject):
data['offset'] = offset data['offset'] = offset
if limit: if limit:
data['limit'] = limit data['limit'] = limit
if timeout: if timeout or timeout == 0:
data['timeout'] = timeout data['timeout'] = timeout
result = request.post(url, data, network_delay=network_delay) result = request.post(url, data, network_delay=network_delay)
@ -1195,7 +1195,7 @@ class Bot(TelegramObject):
url = '%s/setWebhook' % self.base_url url = '%s/setWebhook' % self.base_url
data = {} data = {}
if webhook_url: if webhook_url or webhook_url == '':
data['url'] = webhook_url data['url'] = webhook_url
if certificate: if certificate:
data['certificate'] = certificate data['certificate'] = certificate

2
telegram/utils/request.py
View file

@ -183,7 +183,7 @@ def download(url,
The web location we want to retrieve. The web location we want to retrieve.
filename: filename:
The filename wihtin the path to download the file. The filename within the path to download the file.
""" """
urlretrieve(url, filename) urlretrieve(url, filename)