diff --git a/bin/zulip-send b/bin/zulip-send index 16815dce..7144720b 100755 --- a/bin/zulip-send +++ b/bin/zulip-send @@ -42,7 +42,7 @@ def do_send_message(client, message_data): '''Sends a message and optionally prints status about the same.''' if message_data['type'] == 'stream': - log.info('Sending message to stream "%s", subject "%s"... ' % \ + 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']) diff --git a/bots/check-mirroring b/bots/check-mirroring index c4ec5c01..72b1aa19 100755 --- a/bots/check-mirroring +++ b/bots/check-mirroring @@ -328,11 +328,11 @@ for key in all_keys: continue if key in zhkeys: (stream, test) = zhkeys[key] - logger.warning("%10s: z got %s, h got %s. Sent via Zephyr(%s): class %s" % \ + logger.warning("%10s: z got %s, h got %s. Sent via Zephyr(%s): class %s" % (key, z_key_counts[key], h_key_counts[key], test, stream)) if key in hzkeys: (stream, test) = hzkeys[key] - logger.warning("%10s: z got %s. h got %s. Sent via Zulip(%s): class %s" % \ + logger.warning("%10s: z got %s. h got %s. Sent via Zulip(%s): class %s" % (key, z_key_counts[key], h_key_counts[key], test, stream)) logger.error("") logger.error("Summary of specific problems:") diff --git a/bots/jabber_mirror_backend.py b/bots/jabber_mirror_backend.py index 3a84b00a..683783f2 100755 --- a/bots/jabber_mirror_backend.py +++ b/bots/jabber_mirror_backend.py @@ -317,7 +317,7 @@ user and mirrors messages sent to Jabber rooms to Zulip. Defaults to parser.add_option('--zulip-email-suffix', default=None, action='store', - help= \ + help= '''Add the specified suffix to the local part of email addresses constructed from JIDs and nicks before sending requests to the Zulip server, and remove the suffix before sending requests to the Jabber server. For example, specifying diff --git a/integrations/asana/zulip_asana_mirror b/integrations/asana/zulip_asana_mirror index b832d1a7..029de0a2 100755 --- a/integrations/asana/zulip_asana_mirror +++ b/integrations/asana/zulip_asana_mirror @@ -208,9 +208,9 @@ def process_new_events(): """ # In task queries, Asana only exposes IDs for projects and users, so we need # to look up the mappings. - projects = dict((elt["id"], elt["name"]) for elt in \ + projects = dict((elt["id"], elt["name"]) for elt in fetch_from_asana("/projects")["data"]) - users = dict((elt["id"], elt["name"]) for elt in \ + users = dict((elt["id"], elt["name"]) for elt in fetch_from_asana("/users")["data"]) cutoff = since() diff --git a/zulip/__init__.py b/zulip/__init__.py index ef3c0004..c85bba16 100644 --- a/zulip/__init__.py +++ b/zulip/__init__.py @@ -312,7 +312,7 @@ class Client(object): return False if self.verbose: if not query_state["had_error_retry"]: - sys.stdout.write("zulip API(%s): connection error%s -- retrying." % \ + sys.stdout.write("zulip API(%s): connection error%s -- retrying." % (url.split(API_VERSTRING, 2)[0], error_string,)) query_state["had_error_retry"] = True else: