diff --git a/bots/check-mirroring b/bots/check-mirroring
index 3a18a01..449fbb3 100755
--- a/bots/check-mirroring
+++ b/bots/check-mirroring
@@ -90,7 +90,7 @@ if options.sharded:
         ("tabbott-nagios-test-12", "d"),
         ("tabbott-nagios-test-11", "e"),
         ("tabbott-nagios-test-9", "f"),
-        ]
+    ]
     for (stream, test) in test_streams:
         if stream == "message":
             continue
@@ -99,7 +99,7 @@ else:
     test_streams = [
         ("message", "p"),
         ("tabbott-nagios-test", "a"),
-        ]
+    ]
 
 def print_status_and_exit(status):
     # type: (int) -> None
@@ -262,7 +262,7 @@ for key, (stream, test) in hzkeys.items():
                 "subject": "test",
                 "content": str(key),
                 "to": stream,
-                })
+        })
     receive_zephyrs()
 
 logger.info("Sent Zulip messages!")
diff --git a/bots/irc-mirror.py b/bots/irc-mirror.py
index 9d5c5cb..ddfae93 100755
--- a/bots/irc-mirror.py
+++ b/bots/irc-mirror.py
@@ -69,7 +69,7 @@ class IRCBot(irc.bot.SingleServerIRCBot):
                 "type": "private",
                 "to": "username@example.com",
                 "content": content,
-                }))
+        }))
 
     def on_pubmsg(self, c, e):
         # type: (ServerConnection, Event) -> None
@@ -87,7 +87,7 @@ class IRCBot(irc.bot.SingleServerIRCBot):
                 "to": stream,
                 "subject": "IRC",
                 "content": content,
-                }))
+        }))
 
     def on_dccmsg(self, c, e):
         # type: (ServerConnection, Event) -> None
diff --git a/bots/jabber_mirror_backend.py b/bots/jabber_mirror_backend.py
index 48cc29a..8abbfce 100755
--- a/bots/jabber_mirror_backend.py
+++ b/bots/jabber_mirror_backend.py
@@ -171,7 +171,7 @@ class JabberToZulipBot(ClientXMPP):
             type = "private",
             to = recipient,
             content = msg["body"],
-            )
+        )
         ret = self.zulipToJabber.client.send_message(zulip_message)
         if ret.get("result") != "success":
             logging.error(str(ret))
@@ -199,7 +199,7 @@ class JabberToZulipBot(ClientXMPP):
             subject = subject,
             to = stream,
             content = msg["body"],
-            )
+        )
         ret = self.zulipToJabber.client.send_message(zulip_message)
         if ret.get("result") != "success":
             logging.error(str(ret))
diff --git a/bots/log2zulip b/bots/log2zulip
index 533cd5d..839581b 100755
--- a/bots/log2zulip
+++ b/bots/log2zulip
@@ -45,7 +45,7 @@ def send_log_zulip(file_name, count, lines, extra=""):
         "to": "logs",
         "subject": "%s on %s" % (file_name, platform.node()),
         "content": content,
-        })
+    })
 
 def process_lines(raw_lines, file_name):
     # type: (List[str], str) -> None
diff --git a/contrib_bots/bot_lib.py b/contrib_bots/bot_lib.py
index e083068..89fa68e 100644
--- a/contrib_bots/bot_lib.py
+++ b/contrib_bots/bot_lib.py
@@ -85,7 +85,7 @@ def run_message_handler_for_bot(lib_module, quiet, config_file):
                 message=message,
                 client=restricted_client,
                 state_handler=state_handler
-                )
+            )
 
     signal.signal(signal.SIGINT, exit_gracefully)
 
diff --git a/contrib_bots/bots/foursquare/foursquare.py b/contrib_bots/bots/foursquare/foursquare.py
index 22ce924..e68ac4c 100644
--- a/contrib_bots/bots/foursquare/foursquare.py
+++ b/contrib_bots/bots/foursquare/foursquare.py
@@ -80,7 +80,7 @@ Example Inputs:
                 subject=message['subject'],
                 to=message['display_recipient'],
                 content=letter,
-                ))
+            ))
 
     def handle_message(self, message, client, state_handler):
         words = message['content'].split()
diff --git a/examples/create-user b/examples/create-user
index 351e91f..a9c156d 100755
--- a/examples/create-user
+++ b/examples/create-user
@@ -52,4 +52,4 @@ print(client.create_user({
         'password': options.new_password,
         'full_name': options.new_full_name,
         'short_name': options.new_short_name
-        }))
+}))
diff --git a/integrations/trac/zulip_trac.py b/integrations/trac/zulip_trac.py
index 24187e9..0e17fca 100644
--- a/integrations/trac/zulip_trac.py
+++ b/integrations/trac/zulip_trac.py
@@ -80,7 +80,7 @@ def send_update(ticket, content):
             "to": config.STREAM_FOR_NOTIFICATIONS,
             "content": content,
             "subject": trac_subject(ticket)
-            })
+    })
 
 class ZulipPlugin(Component):
     implements(ITicketChangeListener)
diff --git a/zulip/__init__.py b/zulip/__init__.py
index 93650fe..ddbdc75 100644
--- a/zulip/__init__.py
+++ b/zulip/__init__.py
@@ -288,7 +288,7 @@ class Client(object):
                 client_name=self.client_name,
                 vendor=vendor,
                 vendor_version=vendor_version,
-                )
+        )
 
     def do_api_query(self, orig_request, url, method="POST", longpolling=False, files=None):
         # type: (Mapping[str, Any], str, str, bool, List[IO]) -> Dict[str, Any]