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

Simplification of boolean checks (#662)

Browse source 
* Simplification of boolean checks

* Cast ok to bool for Telegram API json encoding
This commit is contained in:
saschalalala 2017-06-18 12:09:32 +02:00 committed by Jannes Höke
parent 845312da59
commit 9b5e014a0a
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
telegram/bot.py
View file

@ -1960,12 +1960,14 @@ class Bot(TelegramObject):
""" """
if ok is True and (shipping_options is None or error_message is not None): ok = bool(ok)
if ok and (shipping_options is None or error_message is not None):
raise TelegramError( raise TelegramError(
'answerShippingQuery: If ok is True, shipping_options ' 'answerShippingQuery: If ok is True, shipping_options '
'should not be empty and there should not be error_message') 'should not be empty and there should not be error_message')
if ok is False and (shipping_options is not None or error_message is None): if not ok and (shipping_options is not None or error_message is None):
raise TelegramError( raise TelegramError(
'answerShippingQuery: If ok is False, error_message ' 'answerShippingQuery: If ok is False, error_message '
'should not be empty and there should not be shipping_options') 'should not be empty and there should not be shipping_options')
@ -1974,7 +1976,7 @@ class Bot(TelegramObject):
data = {'shipping_query_id': shipping_query_id, 'ok': ok} data = {'shipping_query_id': shipping_query_id, 'ok': ok}
if ok is True: if ok:
data['shipping_options'] = [option.to_dict() for option in shipping_options] data['shipping_options'] = [option.to_dict() for option in shipping_options]
if error_message is not None: if error_message is not None:
data['error_message'] = error_message data['error_message'] = error_message
@ -2009,6 +2011,8 @@ class Bot(TelegramObject):
""" """
ok = bool(ok)
if not (ok ^ (error_message is not None)): if not (ok ^ (error_message is not None)):
raise TelegramError( raise TelegramError(
'answerPreCheckoutQuery: If ok is True, there should ' 'answerPreCheckoutQuery: If ok is True, there should '