summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Teller <d.o.teller+github@gmail.com>2021-01-28 16:53:40 +0100
committerDavid Teller <d.o.teller+github@gmail.com>2021-01-28 16:53:40 +0100
commit31d072aea0a37ad5408995359b89080b5280f57d (patch)
treeede3166f04485be727f3657fa70b90b48a4c7038
parentFIXUP: Making get_event_context a bit more paranoid (diff)
downloadsynapse-31d072aea0a37ad5408995359b89080b5280f57d.tar.xz
FIXUP: linter
-rw-r--r--synapse/handlers/room.py2
-rw-r--r--synapse/rest/admin/rooms.py5
-rw-r--r--tests/rest/admin/test_room.py4
3 files changed, 9 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index e039cea024..99fd063084 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -53,7 +53,7 @@ from synapse.types import (
     create_requester,
 )
 from synapse.util import stringutils
-from synapse.util.async_helpers import Linearizer, maybe_awaitable
+from synapse.util.async_helpers import Linearizer
 from synapse.util.caches.response_cache import ResponseCache
 from synapse.util.stringutils import parse_and_validate_server_name
 from synapse.visibility import filter_events_for_client
diff --git a/synapse/rest/admin/rooms.py b/synapse/rest/admin/rooms.py
index 641e325581..c673ff07e7 100644
--- a/synapse/rest/admin/rooms.py
+++ b/synapse/rest/admin/rooms.py
@@ -15,9 +15,11 @@
 import logging
 from http import HTTPStatus
 from typing import TYPE_CHECKING, List, Optional, Tuple
+from urllib import parse as urlparse
 
 from synapse.api.constants import EventTypes, JoinRules, Membership
 from synapse.api.errors import AuthError, Codes, NotFoundError, SynapseError
+from synapse.api.filtering import Filter
 from synapse.http.servlet import (
     RestServlet,
     assert_params_in_dict,
@@ -33,6 +35,7 @@ from synapse.rest.admin._base import (
 )
 from synapse.storage.databases.main.room import RoomSortOrder
 from synapse.types import JsonDict, RoomAlias, RoomID, UserID, create_requester
+from synapse.util import json_decoder
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
@@ -567,6 +570,7 @@ class ForwardExtremitiesRestServlet(RestServlet):
         extremities = await self.store.get_forward_extremities_for_room(room_id)
         return 200, {"count": len(extremities), "results": extremities}
 
+
 class RoomEventContextServlet(RestServlet):
     """
     Provide the context for an event.
@@ -574,6 +578,7 @@ class RoomEventContextServlet(RestServlet):
     an abuse report and understand what happened during and immediately prior
     to this event.
     """
+
     PATTERNS = admin_patterns("/rooms/(?P<room_id>[^/]*)/context/(?P<event_id>[^/]*)$")
 
     def __init__(self, hs):
diff --git a/tests/rest/admin/test_room.py b/tests/rest/admin/test_room.py
index fd201993d3..f4f5569a89 100644
--- a/tests/rest/admin/test_room.py
+++ b/tests/rest/admin/test_room.py
@@ -1461,7 +1461,9 @@ class JoinAliasRoomTestCase(unittest.HomeserverTestCase):
                 % (room_id, events[midway]["event_id"]),
                 access_token=tok,
             )
-            self.assertEquals(403, int(channel.result["code"]), msg=channel.result["body"])
+            self.assertEquals(
+                403, int(channel.result["code"]), msg=channel.result["body"]
+            )
             self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
 
     def test_context_as_admin(self):