PEP8

8 files changed, 22 insertions, 20 deletions

diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 48f9d460a3..a5c6964707 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -369,7 +369,6 @@ class Auth(object):
         ]
         event.auth_events = zip(auth_events, hashes)
 
-
     @log_function
     def _can_send_event(self, event):
         key = (RoomPowerLevelsEvent.TYPE, "", )
@@ -452,7 +451,7 @@ class Auth(object):
             event.user_id,
         )
 
-       # Check other levels:
+        # Check other levels:
         levels_to_check = [
             ("users_default", []),
             ("events_default", []),
diff --git a/synapse/api/events/room.py b/synapse/api/events/room.py
index 25bc883706..8c4ac45d02 100644
--- a/synapse/api/events/room.py
+++ b/synapse/api/events/room.py
@@ -153,6 +153,7 @@ class RoomPowerLevelsEvent(SynapseStateEvent):
     def get_content_template(self):
         return {}
 
+
 class RoomAliasesEvent(SynapseStateEvent):
     TYPE = "m.room.aliases"
 
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index e798304353..bacba36755 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -549,7 +549,6 @@ class ReplicationLayer(object):
                     origin, pdu.room_id, pdu.event_id,
                 )
 
-
         if not backfilled:
             ret = yield self.handler.on_receive_pdu(
                 pdu,
diff --git a/synapse/federation/transport.py b/synapse/federation/transport.py
index d84a44c211..95c40c6c1b 100644
--- a/synapse/federation/transport.py
+++ b/synapse/federation/transport.py
@@ -284,7 +284,7 @@ class TransportLayer(object):
         origin = None
 
         if request.method == "PUT":
-            #TODO: Handle other method types? other content types?
+            # TODO: Handle other method types? other content types?
             try:
                 content_bytes = request.content.read()
                 content = json.loads(content_bytes)
@@ -296,11 +296,13 @@ class TransportLayer(object):
             try:
                 params = auth.split(" ")[1].split(",")
                 param_dict = dict(kv.split("=") for kv in params)
+
                 def strip_quotes(value):
                     if value.startswith("\""):
                         return value[1:-1]
                     else:
                         return value
+
                 origin = strip_quotes(param_dict["origin"])
                 key = strip_quotes(param_dict["key"])
                 sig = strip_quotes(param_dict["sig"])
@@ -321,7 +323,7 @@ class TransportLayer(object):
             if auth.startswith("X-Matrix"):
                 (origin, key, sig) = parse_auth_header(auth)
                 json_request["origin"] = origin
-                json_request["signatures"].setdefault(origin,{})[key] = sig
+                json_request["signatures"].setdefault(origin, {})[key] = sig
 
         if not json_request["signatures"]:
             raise SynapseError(
@@ -515,7 +517,8 @@ class TransportLayer(object):
             return
 
         try:
-            code, response = yield self.received_handler.on_incoming_transaction(
+            handler = self.received_handler
+            code, response = yield handler.on_incoming_transaction(
                 transaction_data
             )
         except:
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index d98014cac7..f4e7b62bd9 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -192,7 +192,9 @@ class Transaction(JsonEncodedObject):
         transaction_id and origin_server_ts keys.
         """
         if "origin_server_ts" not in kwargs:
-            raise KeyError("Require 'origin_server_ts' to construct a Transaction")
+            raise KeyError(
+                "Require 'origin_server_ts' to construct a Transaction"
+            )
         if "transaction_id" not in kwargs:
             raise KeyError(
                 "Require 'transaction_id' to construct a Transaction"
@@ -204,6 +206,3 @@ class Transaction(JsonEncodedObject):
         kwargs["pdus"] = [p.get_dict() for p in pdus]
 
         return Transaction(**kwargs)
-
-
-
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 587fa308c8..e909af6bd8 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -521,6 +521,9 @@ class FederationHandler(BaseHandler):
 
     @log_function
     def _on_user_joined(self, user, room_id):
-        waiters = self.waiting_for_join_list.get((user.to_string(), room_id), [])
+        waiters = self.waiting_for_join_list.get(
+            (user.to_string(), room_id),
+            []
+        )
         while waiters:
             waiters.pop().callback(None)
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 7d810e6a62..4034437f6b 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -494,11 +494,13 @@ def prepare_database(db_conn):
         user_version = row[0]
 
         if user_version > SCHEMA_VERSION:
-            raise ValueError("Cannot use this database as it is too " +
+            raise ValueError(
+                "Cannot use this database as it is too " +
                 "new for the server to understand"
             )
         elif user_version < SCHEMA_VERSION:
-            logging.info("Upgrading database from version %d",
+            logging.info(
+                "Upgrading database from version %d",
                 user_version
             )
 
@@ -520,4 +522,3 @@ def prepare_database(db_conn):
         c.execute("PRAGMA user_version = %d" % SCHEMA_VERSION)
 
     c.close()
-
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py
index a707030145..a027db3868 100644
--- a/synapse/storage/event_federation.py
+++ b/synapse/storage/event_federation.py
@@ -215,7 +215,7 @@ class EventFederationStore(SQLBaseStore):
         min_depth = self._simple_select_one_onecol_txn(
             txn,
             table="room_depth",
-            keyvalues={"room_id": room_id,},
+            keyvalues={"room_id": room_id},
             retcol="min_depth",
             allow_none=True,
         )
@@ -267,10 +267,8 @@ class EventFederationStore(SQLBaseStore):
                     }
                 )
 
-
-
-            # We only insert as a forward extremity the new pdu if there are no
-            # other pdus that reference it as a prev pdu
+            # We only insert as a forward extremity the new pdu if there are
+            # no other pdus that reference it as a prev pdu
             query = (
                 "INSERT OR IGNORE INTO %(table)s (event_id, room_id) "
                 "SELECT ?, ? WHERE NOT EXISTS ("
@@ -312,7 +310,6 @@ class EventFederationStore(SQLBaseStore):
             )
             txn.execute(query)
 
-
     def get_backfill_events(self, room_id, event_list, limit):
         """Get a list of Events for a given topic that occured before (and
         including) the pdus in pdu_list. Return a list of max size `limit`.