summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-27 14:19:39 +0100
committerErik Johnston <erik@matrix.org>2014-08-27 14:19:39 +0100
commit77a255c7c38a6dab80add45632ffc574099566c8 (patch)
tree23a66e2e53c5db3697fbd7969b9cb2935eea12ba /synapse/handlers/room.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff)
downloadsynapse-77a255c7c38a6dab80add45632ffc574099566c8.tar.xz
PEP8 tweaks.
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 19ade10a91..bf66d74548 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -311,12 +311,18 @@ class MessageHandler(BaseHandler):
                     "end": token[1],
                 }
 
-                current_state = yield self.store.get_current_state(event.room_id)
+                current_state = yield self.store.get_current_state(
+                    event.room_id
+                )
                 d["state"] = [c.get_dict() for c in current_state]
             except:
                 logger.exception("Failed to get snapshot")
 
-        ret = {"rooms": rooms_ret, "presence": presence, "end": now_token.to_string()}
+        ret = {
+            "rooms": rooms_ret,
+            "presence": presence,
+            "end": now_token.to_string()
+        }
 
         defer.returnValue(ret)
 
@@ -499,7 +505,7 @@ class RoomMemberHandler(BaseHandler):
             for entry in member_list
         ]
         chunk_data = {
-            "start": "START",  # FIXME (erikj): START is no longer a valid value
+            "start": "START",  # FIXME (erikj): START is no longer valid
             "end": "END",
             "chunk": event_list
         }