xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix % formatting without a tuple.

Browse source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-03-04 15:02:39 -08:00
parent edcb894776
commit 5b5fda2354
8 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zulip_bots/zulip_bots/bots/giphy/giphy.py
View file

@ -94,9 +94,9 @@ def get_bot_giphy_response(message: Dict[str, str], bot_handler: BotHandler, con
'let\'s try again later! :grin:')
except GiphyNoResultException:
return ('Sorry, I don\'t have a GIF for "%s"! '
':astonished:' % (keyword))
':astonished:' % (keyword,))
return ('[Click to enlarge](%s)'
'[](/static/images/interactive-bot/giphy/powered-by-giphy.png)'
% (gif_url))
% (gif_url,))
handler_class = GiphyHandler

10
zulip_bots/zulip_bots/bots/xkcd/xkcd.py
View file

@ -64,7 +64,7 @@ def get_xkcd_bot_response(message: Dict[str, str], quoted_name: str) -> str:
try:
if command == 'help':
return commands_help % ('xkcd bot supports these commands:')
return commands_help % ('xkcd bot supports these commands:',)
elif command == 'latest':
fetched = fetch_xkcd_query(XkcdBotCommand.LATEST)
elif command == 'random':
@ -72,13 +72,13 @@ def get_xkcd_bot_response(message: Dict[str, str], quoted_name: str) -> str:
elif command.isdigit():
fetched = fetch_xkcd_query(XkcdBotCommand.COMIC_ID, command)
else:
return commands_help % ("xkcd bot only supports these commands, not `%s`:" % (command,))
return commands_help % ("xkcd bot only supports these commands, not `%s`:" % (command,),)
except (requests.exceptions.ConnectionError, XkcdServerError):
logging.exception('Connection error occurred when trying to connect to xkcd server')
return 'Sorry, I cannot process your request right now, please try again later!'
except XkcdNotFoundError:
logging.exception('XKCD server responded 404 when trying to fetch comic with id %s'
% (command))
% (command,))
return 'Sorry, there is likely no xkcd comic strip with id: #%s' % (command,)
else:
return ("#%s: **%s**\n[%s](%s)" % (fetched['num'],
@ -99,12 +99,12 @@ def fetch_xkcd_query(mode: int, comic_id: Optional[str] = None) -> Dict[str, str
latest_id = latest.json()['num']
random_id = random.randint(1, latest_id)
url = XKCD_TEMPLATE_URL % (str(random_id))
url = XKCD_TEMPLATE_URL % (str(random_id),)
elif mode == XkcdBotCommand.COMIC_ID: # Fetch specific comic strip by id number.
if comic_id is None:
raise Exception('Missing comic_id argument')
url = XKCD_TEMPLATE_URL % (comic_id)
url = XKCD_TEMPLATE_URL % (comic_id,)
fetched = requests.get(url)