summary refs log tree commit diff
path: root/synapse/handlers/pagination.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-16 19:22:24 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-16 19:22:24 +0000
commit638820f5713e67cc43e65f25ce09aefcd703450e (patch)
tree06b32ec4c5174d5e4f35ee862b30fa3ef80260f6 /synapse/handlers/pagination.py
parentMerge pull request #6294 from matrix-org/erikj/add_state_storage (diff)
parentUpdate black to 19.10b0 (#6304) (diff)
downloadsynapse-638820f5713e67cc43e65f25ce09aefcd703450e.tar.xz
Update black to 19.10b0 (#6304)
* commit '020add509':
  Update black to 19.10b0 (#6304)
Diffstat (limited to 'synapse/handlers/pagination.py')
-rw-r--r--synapse/handlers/pagination.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py
index f6969e2887..08b068a439 100644
--- a/synapse/handlers/pagination.py
+++ b/synapse/handlers/pagination.py
@@ -320,9 +320,10 @@ class PaginationHandler(object):
         source_config = pagin_config.get_source_config("room")
 
         with (yield self.pagination_lock.read(room_id)):
-            membership, member_event_id = yield self.auth.check_in_room_or_world_readable(
-                room_id, user_id
-            )
+            (
+                membership,
+                member_event_id,
+            ) = yield self.auth.check_in_room_or_world_readable(room_id, user_id)
 
             if source_config.direction == "b":
                 # if we're going backwards, we might need to backfill. This
@@ -405,10 +406,8 @@ class PaginationHandler(object):
         }
 
         if state:
-            chunk["state"] = (
-                yield self._event_serializer.serialize_events(
-                    state, time_now, as_client_event=as_client_event
-                )
+            chunk["state"] = yield self._event_serializer.serialize_events(
+                state, time_now, as_client_event=as_client_event
             )
 
         return chunk