summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-12-21 10:14:57 +0000
committerDavid Baker <dave@matrix.org>2015-12-21 10:14:57 +0000
commit091c545c4fb38f662b61cb46779a813f70971e4f (patch)
tree56d363c3ac2172664177799c61fae8c1df559bb5
parentadd list of things I want to fix with this branch (diff)
downloadsynapse-091c545c4fb38f662b61cb46779a813f70971e4f.tar.xz
pep8
-rw-r--r--synapse/handlers/sync.py6
-rw-r--r--synapse/storage/event_actions.py12
2 files changed, 9 insertions, 9 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 44420a063a..20b2a2595a 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -170,7 +170,7 @@ class SyncHandler(BaseHandler):
         for e in ephemeral_by_room[room_id]:
             if e['type'] != 'm.receipt':
                 continue
-            for receipt_event_id,val in e['content'].items():
+            for receipt_event_id, val in e['content'].items():
                 if 'm.read' in val:
                     if user_id in val['m.read']:
                         return receipt_event_id
@@ -281,7 +281,7 @@ class SyncHandler(BaseHandler):
         )
 
         notifs = yield self.unread_notifs_for_room_id(
-                room_id, sync_config, ephemeral_by_room
+            room_id, sync_config, ephemeral_by_room
         )
         notif_count = None
         if notifs is not None:
@@ -830,4 +830,4 @@ class SyncHandler(BaseHandler):
             # There is no new information in this period, so your notification
             # count is whatever it was last time.
             defer.returnValue(None)
-        defer.returnValue(notifs)
\ No newline at end of file
+        defer.returnValue(notifs)
diff --git a/synapse/storage/event_actions.py b/synapse/storage/event_actions.py
index f7fe78e554..fbd0a42279 100644
--- a/synapse/storage/event_actions.py
+++ b/synapse/storage/event_actions.py
@@ -73,14 +73,13 @@ class EventActionsStore(SQLBaseStore):
                 "       OR (e.topological_ordering == ? AND e.stream_ordering > ?)"
                 ")"
             )
-            txn.execute(sql,
-                (
-                    user_id, room_id,
-                    topological_ordering, topological_ordering, stream_ordering
-                )
+            txn.execute(sql, (
+                user_id, room_id,
+                topological_ordering, topological_ordering, stream_ordering
+            )
             )
             return [
-                { "event_id": row[0], "actions": row[1] } for row in txn.fetchall()
+                {"event_id": row[0], "actions": row[1]} for row in txn.fetchall()
             ]
 
         ret = yield self.runInteraction(
@@ -89,5 +88,6 @@ class EventActionsStore(SQLBaseStore):
         )
         defer.returnValue(ret)
 
+
 class EventActionsTable(object):
     table_name = "event_actions"