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

10
zulip/zulip/__init__.py
View file

@ -565,7 +565,7 @@ class Client:
continue
else:
end_error_retry(False)
return {'msg': "Connection error:\n%s" % traceback.format_exc(),
return {'msg': "Connection error:\n%s" % (traceback.format_exc(),),
"result": "connection-error"}
except requests.exceptions.ConnectionError:
if not self.has_connected:
@ -578,11 +578,11 @@ class Client:
if error_retry(""):
continue
end_error_retry(False)
return {'msg': "Connection error:\n%s" % traceback.format_exc(),
return {'msg': "Connection error:\n%s" % (traceback.format_exc(),),
"result": "connection-error"}
except Exception:
# We'll split this out into more cases as we encounter new bugs.
return {'msg': "Unexpected error:\n%s" % traceback.format_exc(),
return {'msg': "Unexpected error:\n%s" % (traceback.format_exc(),),
"result": "unexpected-error"}
try:
@ -630,7 +630,7 @@ class Client:
if 'error' in res['result']:
if self.verbose:
print("Server returned error:\n%s" % res['msg'])
print("Server returned error:\n%s" % (res['msg'],))
time.sleep(1)
else:
return (res['queue_id'], res['last_event_id'])
@ -653,7 +653,7 @@ class Client:
print("Connection error fetching events -- probably server is temporarily down?")
else:
if self.verbose:
print("Server returned error:\n%s" % res["msg"])
print("Server returned error:\n%s" % (res["msg"],))
# Eventually, we'll only want the
# BAD_EVENT_QUEUE_ID check, but we check for the
# old string to support legacy Zulip servers. We

2
zulip/zulip/send.py
View file

@ -20,7 +20,7 @@ def do_send_message(client: zulip.Client, message_data: Dict[str, Any]) -> bool:
log.info('Sending message to stream "%s", subject "%s"... ' %
(message_data['to'], message_data['subject']))
else:
log.info('Sending message to %s... ' % message_data['to'])
log.info('Sending message to %s... ' % (message_data['to'],))
response = client.send_message(message_data)
if response['result'] == 'success':
log.info('Message sent.')