summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/pagination.py2
-rw-r--r--synapse/handlers/profile.py3
-rw-r--r--synapse/handlers/room_member.py6
3 files changed, 5 insertions, 6 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py

index bc9c9a056f..1d1fe8996d 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py
@@ -22,8 +22,8 @@ from twisted.python.failure import Failure from synapse.api.constants import EventTypes, Membership from synapse.api.errors import SynapseError -from synapse.metrics.background_process_metrics import run_as_background_process from synapse.logging.context import run_in_background +from synapse.metrics.background_process_metrics import run_as_background_process from synapse.storage.state import StateFilter from synapse.types import RoomStreamToken from synapse.util.async_helpers import ReadWriteLock diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py
index e439294ddf..7dfdce9757 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py
@@ -17,7 +17,6 @@ import logging from six import raise_from - from six.moves import range from signedjson.sign import sign_json @@ -32,9 +31,9 @@ from synapse.api.errors import ( StoreError, SynapseError, ) +from synapse.logging.context import run_in_background from synapse.metrics.background_process_metrics import run_as_background_process from synapse.types import UserID, get_domain_from_id -from synapse.logging.context import run_in_background from ._base import BaseHandler diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 0a2ff75629..2f52f2a8f2 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py
@@ -599,9 +599,9 @@ class RoomMemberHandler(object): if requester is not None: sender = UserID.from_string(event.sender) - assert sender == requester.user, ( - "Sender (%s) must be same as requester (%s)" % (sender, requester.user) - ) + assert ( + sender == requester.user + ), "Sender (%s) must be same as requester (%s)" % (sender, requester.user) assert self.hs.is_mine(sender), "Sender must be our own: %s" % (sender,) else: requester = synapse.types.create_requester(target_user)