summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-01-07 16:18:12 +0000
committerKegan Dougal <kegan@matrix.org>2015-01-07 16:18:12 +0000
commit333836ff9205a53934cf0c412b75916740e407b5 (patch)
tree08e23d62e34ec69889d7e82135c610206583ebe8
parentUpdate tests (diff)
downloadsynapse-333836ff9205a53934cf0c412b75916740e407b5.tar.xz
PEP8 and pyflakes warnings
-rw-r--r--synapse/handlers/federation.py2
-rw-r--r--synapse/handlers/room.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index d0de6fd04d..195f7c618a 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -623,7 +623,7 @@ class FederationHandler(BaseHandler): raise AuthError(403, "Host not in room.") events = yield self.store.get_backfill_events( - context, + room_id, pdu_list, limit ) diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 16c6628292..6d0db18e51 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -428,7 +428,9 @@ class RoomMemberHandler(BaseHandler): if not is_host_in_room: # is *anyone* in the room? room_member_keys = [ - v for (k,v) in context.current_state.keys() if k == "m.room.member" + v for (k, v) in context.current_state.keys() if ( + k == "m.room.member" + ) ] if len(room_member_keys) == 0: # has the room been created so we can join it?