summary refs log tree commit diff
path: root/synapse/handlers/pagination.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-11-01 02:43:24 +1100
committerGitHub <noreply@github.com>2019-11-01 02:43:24 +1100
commit020add50997f697c7847ac84b86b457ba2f3e32d (patch)
tree4fe9abbcd1cac11bfe9077a85ceabd7bf9ea94ce /synapse/handlers/pagination.py
parentMerge pull request #6294 from matrix-org/erikj/add_state_storage (diff)
downloadsynapse-020add50997f697c7847ac84b86b457ba2f3e32d.tar.xz
Update black to 19.10b0 (#6304)
* update version of black and also fix the mypy config being overridden
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 b7185fe7a0..97f15a1c32 100644
--- a/synapse/handlers/pagination.py
+++ b/synapse/handlers/pagination.py
@@ -212,9 +212,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
@@ -297,10 +298,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