Merge branch 'develop' into anoa/v2_is

Update INSTALL.md to say that Python 2 is no longer supported (#5953 )
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-09-02 11:54:41 +01:00 · 2019-09-02 11:27:39 +01:00 · 2019-08-30 17:36:38 +01:00 · 2019-08-30 17:18:57 +01:00 · 2019-08-30 17:13:37 +01:00 · 2019-08-30 16:28:26 +01:00
90 changed files with 314 additions and 615 deletions
@@ -1,3 +1,18 @@
+# -*- coding: utf-8 -*-
+# Copyright 2019 The Matrix.org Foundation C.I.C.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import sys
 from tap.parser import Parser
 from tap.line import Result, Unknown, Diagnostic
@@ -1,310 +0,0 @@
-env:
-  COVERALLS_REPO_TOKEN: wsJWOby6j0uCYFiCes3r0XauxO27mx8lD
-
-steps:
-  - command:
-      - "python -m pip install tox"
-      - "tox -e check_codestyle"
-    label: "\U0001F9F9 Check Style"
-    plugins:
-      - docker#v3.0.1:
-          image: "python:3.6"
-          mount-buildkite-agent: false
-
-  - command:
-      - "python -m pip install tox"
-      - "tox -e packaging"
-    label: "\U0001F9F9 packaging"
-    plugins:
-      - docker#v3.0.1:
-          image: "python:3.6"
-          mount-buildkite-agent: false
-
-  - command:
-      - "python -m pip install tox"
-      - "tox -e check_isort"
-    label: "\U0001F9F9 isort"
-    plugins:
-      - docker#v3.0.1:
-          image: "python:3.6"
-          mount-buildkite-agent: false
-
-  - command:
-      - "python -m pip install tox"
-      - "scripts-dev/check-newsfragment"
-    label: ":newspaper: Newsfile"
-    branches: "!master !develop !release-*"
-    plugins:
-      - docker#v3.0.1:
-          image: "python:3.6"
-          propagate-environment: true
-          mount-buildkite-agent: false
-
-  - command:
-      - "python -m pip install tox"
-      - "tox -e check-sampleconfig"
-    label: "\U0001F9F9 check-sample-config"
-    plugins:
-      - docker#v3.0.1:
-          image: "python:3.6"
-          mount-buildkite-agent: false
-
-  - command:
-      - "python -m pip install tox"
-      - "tox -e mypy"
-    label: ":mypy: mypy"
-    plugins:
-      - docker#v3.0.1:
-          image: "python:3.5"
-          mount-buildkite-agent: false
-
-  - wait
-
-  - command:
-      - "apt-get update && apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev zlib1g-dev"
-      - "python3.5 -m pip install tox"
-      - "tox -e py35-old,combine"
-    label: ":python: 3.5 / SQLite / Old Deps"
-    env:
-      TRIAL_FLAGS: "-j 2"
-      LANG: "C.UTF-8"
-    plugins:
-      - docker#v3.0.1:
-          image: "ubuntu:xenial"  # We use xenial to get an old sqlite and python
-          workdir: "/src"
-          mount-buildkite-agent: false
-          propagate-environment: true
-      - matrix-org/coveralls#v1.0:
-          parallel: "true"
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-        - exit_status: 2
-          limit: 2
-
-  - command:
-      - "python -m pip install tox"
-      - "tox -e py35,combine"
-    label: ":python: 3.5 / SQLite"
-    env:
-      TRIAL_FLAGS: "-j 2"
-    plugins:
-      - docker#v3.0.1:
-          image: "python:3.5"
-          workdir: "/src"
-          mount-buildkite-agent: false
-          propagate-environment: true
-      - matrix-org/coveralls#v1.0:
-          parallel: "true"
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-        - exit_status: 2
-          limit: 2
-
-  - command:
-      - "python -m pip install tox"
-      - "tox -e py36,combine"
-    label: ":python: 3.6 / SQLite"
-    env:
-      TRIAL_FLAGS: "-j 2"
-    plugins:
-      - docker#v3.0.1:
-          image: "python:3.6"
-          workdir: "/src"
-          mount-buildkite-agent: false
-          propagate-environment: true
-      - matrix-org/coveralls#v1.0:
-          parallel: "true"
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-        - exit_status: 2
-          limit: 2
-
-  - command:
-      - "python -m pip install tox"
-      - "tox -e py37,combine"
-    label: ":python: 3.7 / SQLite"
-    env:
-      TRIAL_FLAGS: "-j 2"
-    plugins:
-      - docker#v3.0.1:
-          image: "python:3.7"
-          workdir: "/src"
-          mount-buildkite-agent: false
-          propagate-environment: true
-      - matrix-org/coveralls#v1.0:
-          parallel: "true"
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-        - exit_status: 2
-          limit: 2
-
-  - label: ":python: 3.5 / :postgres: 9.5"
-    agents:
-      queue: "medium"
-    env:
-      TRIAL_FLAGS: "-j 8"
-    command:
-      - "bash -c 'python -m pip install tox && python -m tox -e py35-postgres,combine'"
-    plugins:
-      - docker-compose#v2.1.0:
-          run: testenv
-          config:
-            - .buildkite/docker-compose.py35.pg95.yaml
-      - matrix-org/coveralls#v1.0:
-          parallel: "true"
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-        - exit_status: 2
-          limit: 2
-
-  - label: ":python: 3.7 / :postgres: 9.5"
-    agents:
-      queue: "medium"
-    env:
-      TRIAL_FLAGS: "-j 8"
-    command:
-      - "bash -c 'python -m pip install tox && python -m tox -e py37-postgres,combine'"
-    plugins:
-      - docker-compose#v2.1.0:
-          run: testenv
-          config:
-            - .buildkite/docker-compose.py37.pg95.yaml
-      - matrix-org/coveralls#v1.0:
-          parallel: "true"
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-        - exit_status: 2
-          limit: 2
-
-  - label: ":python: 3.7 / :postgres: 11"
-    agents:
-      queue: "medium"
-    env:
-      TRIAL_FLAGS: "-j 8"
-    command:
-      - "bash -c 'python -m pip install tox && python -m tox -e py37-postgres,combine'"
-    plugins:
-      - docker-compose#v2.1.0:
-          run: testenv
-          config:
-            - .buildkite/docker-compose.py37.pg11.yaml
-      - matrix-org/coveralls#v1.0:
-          parallel: "true"
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-        - exit_status: 2
-          limit: 2
-
-  - label: "SyTest - :python: 3.5 / SQLite / Monolith"
-    agents:
-      queue: "medium"
-    command:
-      - "bash .buildkite/merge_base_branch.sh"
-      - "bash /synapse_sytest.sh"
-    plugins:
-      - docker#v3.0.1:
-          image: "matrixdotorg/sytest-synapse:py35"
-          propagate-environment: true
-          always-pull: true
-          workdir: "/src"
-          entrypoint: ["/bin/sh", "-e", "-c"]
-          mount-buildkite-agent: false
-          volumes: ["./logs:/logs"]
-      - artifacts#v1.2.0:
-          upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/coverage.xml" ]
-      - matrix-org/annotate:
-          path: "logs/annotate.md"
-          style: "error"
-      - matrix-org/coveralls#v1.0:
-          parallel: "true"
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-        - exit_status: 2
-          limit: 2
-
-  - label: "SyTest - :python: 3.5 / :postgres: 9.6 / Monolith"
-    agents:
-      queue: "medium"
-    env:
-      POSTGRES: "1"
-    command:
-      - "bash .buildkite/merge_base_branch.sh"
-      - "bash /synapse_sytest.sh"
-    plugins:
-      - docker#v3.0.1:
-          image: "matrixdotorg/sytest-synapse:py35"
-          propagate-environment: true
-          always-pull: true
-          workdir: "/src"
-          entrypoint: ["/bin/sh", "-e", "-c"]
-          mount-buildkite-agent: false
-          volumes: ["./logs:/logs"]
-      - artifacts#v1.2.0:
-          upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/coverage.xml" ]
-      - matrix-org/annotate:
-          path: "logs/annotate.md"
-          style: "error"
-      - matrix-org/coveralls#v1.0:
-          parallel: "true"
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-        - exit_status: 2
-          limit: 2
-
-  - label: "SyTest - :python: 3.5 / :postgres: 9.6 / Workers"
-    agents:
-      queue: "medium"
-    env:
-      POSTGRES: "1"
-      WORKERS: "1"
-      BLACKLIST: "synapse-blacklist-with-workers"
-    command:
-      - "bash .buildkite/merge_base_branch.sh"
-      - "bash -c 'cat /src/sytest-blacklist /src/.buildkite/worker-blacklist > /src/synapse-blacklist-with-workers'"
-      - "bash /synapse_sytest.sh"
-    plugins:
-      - docker#v3.0.1:
-          image: "matrixdotorg/sytest-synapse:py35"
-          propagate-environment: true
-          always-pull: true
-          workdir: "/src"
-          entrypoint: ["/bin/sh", "-e", "-c"]
-          mount-buildkite-agent: false
-          volumes: ["./logs:/logs"]
-      - artifacts#v1.2.0:
-          upload: [ "logs/**/*.log", "logs/**/*.log.*", "logs/coverage.xml" ]
-      - matrix-org/annotate:
-          path: "logs/annotate.md"
-          style: "error"
-      - matrix-org/coveralls#v1.0:
-          parallel: "true"
-    retry:
-      automatic:
-        - exit_status: -1
-          limit: 2
-        - exit_status: 2
-          limit: 2
-
-  - wait: ~
-    continue_on_failure: true
-
-  - label: Trigger webhook
-    command: "curl -k https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN -d \"payload[build_num]=$BUILDKITE_BUILD_NUMBER&payload[status]=done\""
@@ -36,7 +36,7 @@ that your email address is probably `user@example.com` rather than
 System requirements:

 - POSIX-compliant system (tested on Linux & OS X)
- Python 3.5, 3.6, 3.7, or 2.7
+- Python 3.5, 3.6, or 3.7
 - At least 1GB of free RAM if you want to join large public rooms like #matrix:matrix.org

 Synapse is written in Python but some of the libraries it uses are written in
@@ -421,7 +421,7 @@ If Synapse is not configured with an SMTP server, password reset via email will

 The easiest way to create a new user is to do so from a client like [Riot](https://riot.im).

-Alternatively you can do so from the command line if you have installed via pip. 
+Alternatively you can do so from the command line if you have installed via pip.

 This can be done as follows:

@@ -0,0 +1 @@
+Add temporary flag to /versions in unstable_features to indicate this Synapse supports receiving id_access_token parameters on calls to identity server-proxying endpoints.
@@ -0,0 +1 @@
+Remove unnecessary parentheses in return statements.
@@ -0,0 +1 @@
+Remove unused jenkins/prepare_sytest.sh file.
@@ -0,0 +1 @@
+Move Buildkite pipeline config to the pipelines repo.
@@ -0,0 +1 @@
+Update INSTALL.md to say that Python 2 is no longer supported.
@@ -1,16 +0,0 @@
-#! /bin/bash
-
-set -eux
-
-cd "`dirname $0`/.."
-
-TOX_DIR=$WORKSPACE/.tox
-
-mkdir -p $TOX_DIR
-
-if ! [ $TOX_DIR -ef .tox ]; then
-    ln -s "$TOX_DIR" .tox
-fi
-
-# set up the virtualenv
-tox -e py27 --notest -v
@@ -276,25 +276,25 @@ class Auth(object):
            self.get_access_token_from_request(request)
        )
        if app_service is None:
-            return (None, None)
+            return None, None

        if app_service.ip_range_whitelist:
            ip_address = IPAddress(self.hs.get_ip_from_request(request))
            if ip_address not in app_service.ip_range_whitelist:
-                return (None, None)
+                return None, None

        if b"user_id" not in request.args:
-            return (app_service.sender, app_service)
+            return app_service.sender, app_service

        user_id = request.args[b"user_id"][0].decode("utf8")
        if app_service.sender == user_id:
-            return (app_service.sender, app_service)
+            return app_service.sender, app_service

        if not app_service.is_interested_in_user(user_id):
            raise AuthError(403, "Application service cannot masquerade as this user.")
        if not (yield self.store.get_user_by_id(user_id)):
            raise AuthError(403, "Application service has not registered this user")
-        return (user_id, app_service)
+        return user_id, app_service

    @defer.inlineCallbacks
    def get_user_by_access_token(self, token, rights="access"):
@@ -694,7 +694,7 @@ class Auth(object):
            #  * The user is a guest user, and has joined the room
            # else it will throw.
            member_event = yield self.check_user_was_in_room(room_id, user_id)
-            return (member_event.membership, member_event.event_id)
+            return member_event.membership, member_event.event_id
        except AuthError:
            visibility = yield self.state.get_current_state(
                room_id, EventTypes.RoomHistoryVisibility, ""
@@ -703,7 +703,7 @@ class Auth(object):
                visibility
                and visibility.content["history_visibility"] == "world_readable"
            ):
-                return (Membership.JOIN, None)
+                return Membership.JOIN, None
                return
            raise AuthError(
                403, "Guest access not allowed", errcode=Codes.GUEST_ACCESS_FORBIDDEN
@@ -70,12 +70,12 @@ class PresenceStatusStubServlet(RestServlet):
        except HttpResponseException as e:
            raise e.to_synapse_error()

-        return (200, result)
+        return 200, result

    @defer.inlineCallbacks
    def on_PUT(self, request, user_id):
        yield self.auth.get_user_by_req(request)
-        return (200, {})
+        return 200, {}


 class KeyUploadServlet(RestServlet):
@@ -126,11 +126,11 @@ class KeyUploadServlet(RestServlet):
                self.main_uri + request.uri.decode("ascii"), body, headers=headers
            )

-            return (200, result)
+            return 200, result
        else:
            # Just interested in counts.
            result = yield self.store.count_e2e_one_time_keys(user_id, device_id)
-            return (200, {"one_time_key_counts": result})
+            return 200, {"one_time_key_counts": result}


 class FrontendProxySlavedStore(
@@ -83,7 +83,7 @@ def compute_content_hash(event_dict, hash_algorithm):
    event_json_bytes = encode_canonical_json(event_dict)

    hashed = hash_algorithm(event_json_bytes)
-    return (hashed.name, hashed.digest())
+    return hashed.name, hashed.digest()


 def compute_event_reference_hash(event, hash_algorithm=hashlib.sha256):
@@ -106,7 +106,7 @@ def compute_event_reference_hash(event, hash_algorithm=hashlib.sha256):
    event_dict.pop("unsigned", None)
    event_json_bytes = encode_canonical_json(event_dict)
    hashed = hash_algorithm(event_json_bytes)
-    return (hashed.name, hashed.digest())
+    return hashed.name, hashed.digest()


 def compute_event_signature(event_dict, signature_name, signing_key):
@@ -355,7 +355,7 @@ class FederationClient(FederationBase):

            auth_chain.sort(key=lambda e: e.depth)

-            return (pdus, auth_chain)
+            return pdus, auth_chain
        except HttpResponseException as e:
            if e.code == 400 or e.code == 404:
                logger.info("Failed to use get_room_state_ids API, falling back")
@@ -404,7 +404,7 @@ class FederationClient(FederationBase):

        signed_auth.sort(key=lambda e: e.depth)

-        return (signed_pdus, signed_auth)
+        return signed_pdus, signed_auth

    @defer.inlineCallbacks
    def get_events_from_store_or_dest(self, destination, room_id, event_ids):
@@ -429,7 +429,7 @@ class FederationClient(FederationBase):
            missing_events.discard(k)

        if not missing_events:
-            return (signed_events, failed_to_fetch)
+            return signed_events, failed_to_fetch

        logger.debug(
            "Fetching unknown state/auth events %s for room %s",
@@ -465,7 +465,7 @@ class FederationClient(FederationBase):
            # We removed all events we successfully fetched from `batch`
            failed_to_fetch.update(batch)

-        return (signed_events, failed_to_fetch)
+        return signed_events, failed_to_fetch

    @defer.inlineCallbacks
    @log_function
@@ -100,7 +100,7 @@ class FederationServer(FederationBase):

            res = self._transaction_from_pdus(pdus).get_dict()

-        return (200, res)
+        return 200, res

    @defer.inlineCallbacks
    @log_function
@@ -163,7 +163,7 @@ class FederationServer(FederationBase):
            yield self.transaction_actions.set_response(
                origin, transaction, 400, response
            )
-            return (400, response)
+            return 400, response

        received_pdus_counter.inc(len(transaction.pdus))

@@ -265,7 +265,7 @@ class FederationServer(FederationBase):
        logger.debug("Returning: %s", str(response))

        yield self.transaction_actions.set_response(origin, transaction, 200, response)
-        return (200, response)
+        return 200, response

    @defer.inlineCallbacks
    def received_edu(self, origin, edu_type, content):
@@ -298,7 +298,7 @@ class FederationServer(FederationBase):
                event_id,
            )

-        return (200, resp)
+        return 200, resp

    @defer.inlineCallbacks
    def on_state_ids_request(self, origin, room_id, event_id):
@@ -315,7 +315,7 @@ class FederationServer(FederationBase):
        state_ids = yield self.handler.get_state_ids_for_pdu(room_id, event_id)
        auth_chain_ids = yield self.store.get_auth_chain_ids(state_ids)

-        return (200, {"pdu_ids": state_ids, "auth_chain_ids": auth_chain_ids})
+        return 200, {"pdu_ids": state_ids, "auth_chain_ids": auth_chain_ids}

    @defer.inlineCallbacks
    def _on_context_state_request_compute(self, room_id, event_id):
@@ -345,15 +345,15 @@ class FederationServer(FederationBase):
        pdu = yield self.handler.get_persisted_pdu(origin, event_id)

        if pdu:
-            return (200, self._transaction_from_pdus([pdu]).get_dict())
+            return 200, self._transaction_from_pdus([pdu]).get_dict()
        else:
-            return (404, "")
+            return 404, ""

    @defer.inlineCallbacks
    def on_query_request(self, query_type, args):
        received_queries_counter.labels(query_type).inc()
        resp = yield self.registry.on_query(query_type, args)
-        return (200, resp)
+        return 200, resp

    @defer.inlineCallbacks
    def on_make_join_request(self, origin, room_id, user_id, supported_versions):
@@ -435,7 +435,7 @@ class FederationServer(FederationBase):

        logger.debug("on_send_leave_request: pdu sigs: %s", pdu.signatures)
        yield self.handler.on_send_leave_request(origin, pdu)
-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_event_auth(self, origin, room_id, event_id):
@@ -446,7 +446,7 @@ class FederationServer(FederationBase):
            time_now = self._clock.time_msec()
            auth_pdus = yield self.handler.on_event_auth(event_id)
            res = {"auth_chain": [a.get_pdu_json(time_now) for a in auth_pdus]}
-        return (200, res)
+        return 200, res

    @defer.inlineCallbacks
    def on_query_auth_request(self, origin, content, room_id, event_id):
@@ -499,7 +499,7 @@ class FederationServer(FederationBase):
                "missing": ret.get("missing", []),
            }

-        return (200, send_content)
+        return 200, send_content

    @log_function
    def on_query_client_keys(self, origin, content):
@@ -51,8 +51,8 @@ class AccountDataEventSource(object):
                    {"type": account_data_type, "content": content, "room_id": room_id}
                )

-        return (results, current_stream_id)
+        return results, current_stream_id

    @defer.inlineCallbacks
    def get_pagination_rows(self, user, config, key):
-        return ([], config.to_id)
+        return [], config.to_id
@@ -280,7 +280,7 @@ class AuthHandler(BaseHandler):
                    creds,
                    list(clientdict),
                )
-                return (creds, clientdict, session["id"])
+                return creds, clientdict, session["id"]

        ret = self._auth_dict_for_flows(flows, session)
        ret["completed"] = list(creds)
@@ -722,7 +722,7 @@ class AuthHandler(BaseHandler):
                known_login_type = True
                is_valid = yield provider.check_password(qualified_user_id, password)
                if is_valid:
-                    return (qualified_user_id, None)
+                    return qualified_user_id, None

            if not hasattr(provider, "get_supported_login_types") or not hasattr(
                provider, "check_auth"
@@ -766,7 +766,7 @@ class AuthHandler(BaseHandler):
            )

            if canonical_user_id:
-                return (canonical_user_id, None)
+                return canonical_user_id, None

        if not known_login_type:
            raise SynapseError(400, "Unknown login type %s" % login_type)
@@ -816,7 +816,7 @@ class AuthHandler(BaseHandler):
                        result = (result, None)
                    return result

-        return (None, None)
+        return None, None

    @defer.inlineCallbacks
    def _check_local_password(self, user_id, password):
@@ -1428,7 +1428,7 @@ class FederationHandler(BaseHandler):
        assert event.user_id == user_id
        assert event.state_key == user_id
        assert event.room_id == room_id
-        return (origin, event, format_ver)
+        return origin, event, format_ver

    @defer.inlineCallbacks
    @log_function
@@ -449,7 +449,7 @@ class InitialSyncHandler(BaseHandler):
            #  * The user is a guest user, and has joined the room
            # else it will throw.
            member_event = yield self.auth.check_user_was_in_room(room_id, user_id)
-            return (member_event.membership, member_event.event_id)
+            return member_event.membership, member_event.event_id
            return
        except AuthError:
            visibility = yield self.state_handler.get_current_state(
@@ -459,7 +459,7 @@ class InitialSyncHandler(BaseHandler):
                visibility
                and visibility.content["history_visibility"] == "world_readable"
            ):
-                return (Membership.JOIN, None)
+                return Membership.JOIN, None
                return
            raise AuthError(
                403, "Guest access not allowed", errcode=Codes.GUEST_ACCESS_FORBIDDEN
@@ -1032,7 +1032,7 @@ class PresenceEventSource(object):
                #
                # Hence this guard where we just return nothing so that the sync
                # doesn't return. C.f. #5503.
-                return ([], max_token)
+                return [], max_token

            presence = self.get_presence_handler()
            stream_change_cache = self.store.presence_stream_cache
@@ -1279,7 +1279,7 @@ def get_interested_parties(store, states):
        # Always notify self
        users_to_states.setdefault(state.user_id, []).append(state)

-    return (room_ids_to_states, users_to_states)
+    return room_ids_to_states, users_to_states


@defer.inlineCallbacks
@@ -148,7 +148,7 @@ class ReceiptEventSource(object):
        to_key = yield self.get_current_key()

        if from_key == to_key:
-            return ([], to_key)
+            return [], to_key

        events = yield self.store.get_linearized_receipts_for_rooms(
            room_ids, from_key=from_key, to_key=to_key
@@ -622,7 +622,7 @@ class RegistrationHandler(BaseHandler):
                initial_display_name=initial_display_name,
                is_guest=is_guest,
            )
-            return (r["device_id"], r["access_token"])
+            return r["device_id"], r["access_token"]

        valid_until_ms = None
        if self.session_lifetime is not None:
@@ -1018,7 +1018,7 @@ class RoomMemberHandler(object):
        if not public_keys:
            public_keys.append(fallback_public_key)
        display_name = data["display_name"]
-        return (token, public_keys, fallback_public_key, display_name)
+        return token, public_keys, fallback_public_key, display_name

    @defer.inlineCallbacks
    def _is_host_in_room(self, current_state_ids):
@@ -378,7 +378,7 @@ class SyncHandler(object):
                event_copy = {k: v for (k, v) in iteritems(event) if k != "room_id"}
                ephemeral_by_room.setdefault(room_id, []).append(event_copy)

-        return (now_token, ephemeral_by_room)
+        return now_token, ephemeral_by_room

    @defer.inlineCallbacks
    def _load_filtered_recents(
@@ -1332,7 +1332,7 @@ class SyncHandler(object):
                    )
                    if not tags_by_room:
                        logger.debug("no-oping sync")
-                        return ([], [], [], [])
+                        return [], [], [], []

        ignored_account_data = yield self.store.get_global_account_data_by_type_for_user(
            "m.ignored_user_list", user_id=user_id
@@ -1642,7 +1642,7 @@ class SyncHandler(object):
                )
            room_entries.append(entry)

-        return (room_entries, invited, newly_joined_rooms, newly_left_rooms)
+        return room_entries, invited, newly_joined_rooms, newly_left_rooms

    @defer.inlineCallbacks
    def _get_all_rooms(self, sync_result_builder, ignored_users):
@@ -1716,7 +1716,7 @@ class SyncHandler(object):
                    )
                )

-        return (room_entries, invited, [])
+        return room_entries, invited, []

    @defer.inlineCallbacks
    def _generate_room_entry(
@@ -319,4 +319,4 @@ class TypingNotificationEventSource(object):
        return self.get_typing_handler()._latest_room_serial

    def get_pagination_rows(self, user, pagination_config, key):
-        return ([], pagination_config.from_key)
+        return [], pagination_config.from_key
@@ -207,7 +207,7 @@ class WellKnownResolver(object):
            cache_period + WELL_KNOWN_REMEMBER_DOMAIN_HAD_VALID,
        )

-        return (result, cache_period)
+        return result, cache_period

    @defer.inlineCallbacks
    def _make_well_known_request(self, server_name, retry):
@@ -101,7 +101,7 @@ class ModuleApi(object):
        )
        user_id = yield self.register_user(localpart, displayname, emails)
        _, access_token = yield self.register_device(user_id)
-        return (user_id, access_token)
+        return user_id, access_token

    def register_user(self, localpart, displayname=None, emails=[]):
        """Registers a new user with given localpart and optional displayname, emails.
@@ -472,11 +472,11 @@ class Notifier(object):
        joined_room_ids = yield self.store.get_rooms_for_user(user.to_string())
        if explicit_room_id:
            if explicit_room_id in joined_room_ids:
-                return ([explicit_room_id], True)
+                return [explicit_room_id], True
            if (yield self._is_world_readable(explicit_room_id)):
-                return ([explicit_room_id], False)
+                return [explicit_room_id], False
            raise AuthError(403, "Non-joined access not allowed")
-        return (joined_room_ids, True)
+        return joined_room_ids, True

    @defer.inlineCallbacks
    def _is_world_readable(self, room_id):
@@ -134,7 +134,7 @@ class BulkPushRuleEvaluator(object):

        pl_event = auth_events.get(POWER_KEY)

-        return (pl_event.content if pl_event else {}, sender_level)
+        return pl_event.content if pl_event else {}, sender_level

    @defer.inlineCallbacks
    def action_for_event_by_user(self, event, context):
@@ -113,7 +113,7 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint):
            event_and_contexts, backfilled
        )

-        return (200, {})
+        return 200, {}


 class ReplicationFederationSendEduRestServlet(ReplicationEndpoint):
@@ -156,7 +156,7 @@ class ReplicationFederationSendEduRestServlet(ReplicationEndpoint):

        result = yield self.registry.on_edu(edu_type, origin, edu_content)

-        return (200, result)
+        return 200, result


 class ReplicationGetQueryRestServlet(ReplicationEndpoint):
@@ -204,7 +204,7 @@ class ReplicationGetQueryRestServlet(ReplicationEndpoint):

        result = yield self.registry.on_query(query_type, args)

-        return (200, result)
+        return 200, result


 class ReplicationCleanRoomRestServlet(ReplicationEndpoint):
@@ -238,7 +238,7 @@ class ReplicationCleanRoomRestServlet(ReplicationEndpoint):
    def _handle_request(self, request, room_id):
        yield self.store.clean_room_for_join(room_id)

-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -64,7 +64,7 @@ class RegisterDeviceReplicationServlet(ReplicationEndpoint):
            user_id, device_id, initial_display_name, is_guest
        )

-        return (200, {"device_id": device_id, "access_token": access_token})
+        return 200, {"device_id": device_id, "access_token": access_token}


 def register_servlets(hs, http_server):
@@ -83,7 +83,7 @@ class ReplicationRemoteJoinRestServlet(ReplicationEndpoint):
            remote_room_hosts, room_id, user_id, event_content
        )

-        return (200, {})
+        return 200, {}


 class ReplicationRemoteRejectInviteRestServlet(ReplicationEndpoint):
@@ -153,7 +153,7 @@ class ReplicationRemoteRejectInviteRestServlet(ReplicationEndpoint):
            yield self.store.locally_reject_invite(user_id, room_id)
            ret = {}

-        return (200, ret)
+        return 200, ret


 class ReplicationUserJoinedLeftRoomRestServlet(ReplicationEndpoint):
@@ -202,7 +202,7 @@ class ReplicationUserJoinedLeftRoomRestServlet(ReplicationEndpoint):
        else:
            raise Exception("Unrecognized change: %r", change)

-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -90,7 +90,7 @@ class ReplicationRegisterServlet(ReplicationEndpoint):
            address=content["address"],
        )

-        return (200, {})
+        return 200, {}


 class ReplicationPostRegisterActionsServlet(ReplicationEndpoint):
@@ -143,7 +143,7 @@ class ReplicationPostRegisterActionsServlet(ReplicationEndpoint):
            bind_msisdn=bind_msisdn,
        )

-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -117,7 +117,7 @@ class ReplicationSendEventRestServlet(ReplicationEndpoint):
            requester, event, context, ratelimit=ratelimit, extra_users=extra_users
        )

-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -158,7 +158,7 @@ class Stream(object):
        updates, current_token = yield self.get_updates_since(self.last_token)
        self.last_token = current_token

-        return (updates, current_token)
+        return updates, current_token

    @defer.inlineCallbacks
    def get_updates_since(self, from_token):
@@ -172,14 +172,14 @@ class Stream(object):
                sent over the replication steam.
        """
        if from_token in ("NOW", "now"):
-            return ([], self.upto_token)
+            return [], self.upto_token

        current_token = self.upto_token

        from_token = int(from_token)

        if from_token == current_token:
-            return ([], current_token)
+            return [], current_token

        if self._LIMITED:
            rows = yield self.update_function(
@@ -198,7 +198,7 @@ class Stream(object):
        if self._LIMITED and len(updates) >= MAX_EVENTS_BEHIND:
            raise Exception("stream %s has fallen behind" % (self.NAME))

-        return (updates, current_token)
+        return updates, current_token

    def current_token(self):
        """Gets the current token of the underlying streams. Should be provided
@@ -69,7 +69,7 @@ class UsersRestServlet(RestServlet):

        ret = yield self.handlers.admin_handler.get_users()

-        return (200, ret)
+        return 200, ret


 class VersionServlet(RestServlet):
@@ -120,7 +120,7 @@ class UserRegisterServlet(RestServlet):

        nonce = self.hs.get_secrets().token_hex(64)
        self.nonces[nonce] = int(self.reactor.seconds())
-        return (200, {"nonce": nonce})
+        return 200, {"nonce": nonce}

    @defer.inlineCallbacks
    def on_POST(self, request):
@@ -212,7 +212,7 @@ class UserRegisterServlet(RestServlet):
        )

        result = yield register._create_registration_details(user_id, body)
-        return (200, result)
+        return 200, result


 class WhoisRestServlet(RestServlet):
@@ -237,7 +237,7 @@ class WhoisRestServlet(RestServlet):

        ret = yield self.handlers.admin_handler.get_whois(target_user)

-        return (200, ret)
+        return 200, ret


 class PurgeHistoryRestServlet(RestServlet):
@@ -322,7 +322,7 @@ class PurgeHistoryRestServlet(RestServlet):
            room_id, token, delete_local_events=delete_local_events
        )

-        return (200, {"purge_id": purge_id})
+        return 200, {"purge_id": purge_id}


 class PurgeHistoryStatusRestServlet(RestServlet):
@@ -347,7 +347,7 @@ class PurgeHistoryStatusRestServlet(RestServlet):
        if purge_status is None:
            raise NotFoundError("purge id '%s' not found" % purge_id)

-        return (200, purge_status.asdict())
+        return 200, purge_status.asdict()


 class DeactivateAccountRestServlet(RestServlet):
@@ -379,7 +379,7 @@ class DeactivateAccountRestServlet(RestServlet):
        else:
            id_server_unbind_result = "no-support"

-        return (200, {"id_server_unbind_result": id_server_unbind_result})
+        return 200, {"id_server_unbind_result": id_server_unbind_result}


 class ShutdownRoomRestServlet(RestServlet):
@@ -549,7 +549,7 @@ class ResetPasswordRestServlet(RestServlet):
        yield self._set_password_handler.set_password(
            target_user_id, new_password, requester
        )
-        return (200, {})
+        return 200, {}


 class GetUsersPaginatedRestServlet(RestServlet):
@@ -591,7 +591,7 @@ class GetUsersPaginatedRestServlet(RestServlet):
        logger.info("limit: %s, start: %s", limit, start)

        ret = yield self.handlers.admin_handler.get_users_paginate(order, start, limit)
-        return (200, ret)
+        return 200, ret

    @defer.inlineCallbacks
    def on_POST(self, request, target_user_id):
@@ -619,7 +619,7 @@ class GetUsersPaginatedRestServlet(RestServlet):
        logger.info("limit: %s, start: %s", limit, start)

        ret = yield self.handlers.admin_handler.get_users_paginate(order, start, limit)
-        return (200, ret)
+        return 200, ret


 class SearchUsersRestServlet(RestServlet):
@@ -662,7 +662,7 @@ class SearchUsersRestServlet(RestServlet):
        logger.info("term: %s ", term)

        ret = yield self.handlers.admin_handler.search_users(term)
-        return (200, ret)
+        return 200, ret


 class DeleteGroupAdminRestServlet(RestServlet):
@@ -685,7 +685,7 @@ class DeleteGroupAdminRestServlet(RestServlet):
            raise SynapseError(400, "Can only delete local groups")

        yield self.group_server.delete_group(group_id, requester.user.to_string())
-        return (200, {})
+        return 200, {}


 class AccountValidityRenewServlet(RestServlet):
@@ -716,7 +716,7 @@ class AccountValidityRenewServlet(RestServlet):
        )

        res = {"expiration_ts": expiration_ts}
-        return (200, res)
+        return 200, res


 ########################################################################################
@@ -49,7 +49,7 @@ class QuarantineMediaInRoom(RestServlet):
            room_id, requester.user.to_string()
        )

-        return (200, {"num_quarantined": num_quarantined})
+        return 200, {"num_quarantined": num_quarantined}


 class ListMediaInRoom(RestServlet):
@@ -70,7 +70,7 @@ class ListMediaInRoom(RestServlet):

        local_mxcs, remote_mxcs = yield self.store.get_media_mxcs_in_room(room_id)

-        return (200, {"local": local_mxcs, "remote": remote_mxcs})
+        return 200, {"local": local_mxcs, "remote": remote_mxcs}


 class PurgeMediaCacheRestServlet(RestServlet):
@@ -89,7 +89,7 @@ class PurgeMediaCacheRestServlet(RestServlet):

        ret = yield self.media_repository.delete_old_remote_media(before_ts)

-        return (200, ret)
+        return 200, ret


 def register_servlets_for_media_repo(hs, http_server):
@@ -54,4 +54,4 @@ class PurgeRoomServlet(RestServlet):

        await self.pagination_handler.purge_room(body["room_id"])

-        return (200, {})
+        return 200, {}
@@ -92,7 +92,7 @@ class SendServerNoticeServlet(RestServlet):
            event_content=body["content"],
        )

-        return (200, {"event_id": event.event_id})
+        return 200, {"event_id": event.event_id}

    def on_PUT(self, request, txn_id):
        return self.txns.fetch_or_execute_request(
@@ -71,7 +71,7 @@ class UserAdminServlet(RestServlet):
        is_admin = yield self.handlers.admin_handler.get_user_server_admin(target_user)
        is_admin = bool(is_admin)

-        return (200, {"admin": is_admin})
+        return 200, {"admin": is_admin}

    @defer.inlineCallbacks
    def on_PUT(self, request, user_id):
@@ -97,4 +97,4 @@ class UserAdminServlet(RestServlet):
            target_user, set_admin_to
        )

-        return (200, {})
+        return 200, {}
@@ -54,7 +54,7 @@ class ClientDirectoryServer(RestServlet):
        dir_handler = self.handlers.directory_handler
        res = yield dir_handler.get_association(room_alias)

-        return (200, res)
+        return 200, res

    @defer.inlineCallbacks
    def on_PUT(self, request, room_alias):
@@ -87,7 +87,7 @@ class ClientDirectoryServer(RestServlet):
            requester, room_alias, room_id, servers
        )

-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_DELETE(self, request, room_alias):
@@ -102,7 +102,7 @@ class ClientDirectoryServer(RestServlet):
                service.url,
                room_alias.to_string(),
            )
-            return (200, {})
+            return 200, {}
        except InvalidClientCredentialsError:
            # fallback to default user behaviour if they aren't an AS
            pass
@@ -118,7 +118,7 @@ class ClientDirectoryServer(RestServlet):
            "User %s deleted alias %s", user.to_string(), room_alias.to_string()
        )

-        return (200, {})
+        return 200, {}


 class ClientDirectoryListServer(RestServlet):
@@ -136,7 +136,7 @@ class ClientDirectoryListServer(RestServlet):
        if room is None:
            raise NotFoundError("Unknown room")

-        return (200, {"visibility": "public" if room["is_public"] else "private"})
+        return 200, {"visibility": "public" if room["is_public"] else "private"}

    @defer.inlineCallbacks
    def on_PUT(self, request, room_id):
@@ -149,7 +149,7 @@ class ClientDirectoryListServer(RestServlet):
            requester, room_id, visibility
        )

-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_DELETE(self, request, room_id):
@@ -159,7 +159,7 @@ class ClientDirectoryListServer(RestServlet):
            requester, room_id, "private"
        )

-        return (200, {})
+        return 200, {}


 class ClientAppserviceDirectoryListServer(RestServlet):
@@ -193,4 +193,4 @@ class ClientAppserviceDirectoryListServer(RestServlet):
            requester.app_service.id, network_id, room_id, visibility
        )

-        return (200, {})
+        return 200, {}
@@ -67,10 +67,10 @@ class EventStreamRestServlet(RestServlet):
            is_guest=is_guest,
        )

-        return (200, chunk)
+        return 200, chunk

    def on_OPTIONS(self, request):
-        return (200, {})
+        return 200, {}


 # TODO: Unit test gets, with and without auth, with different kinds of events.
@@ -91,9 +91,9 @@ class EventRestServlet(RestServlet):
        time_now = self.clock.time_msec()
        if event:
            event = yield self._event_serializer.serialize_event(event, time_now)
-            return (200, event)
+            return 200, event
        else:
-            return (404, "Event not found.")
+            return 404, "Event not found."


 def register_servlets(hs, http_server):
@@ -42,7 +42,7 @@ class InitialSyncRestServlet(RestServlet):
            include_archived=include_archived,
        )

-        return (200, content)
+        return 200, content


 def register_servlets(hs, http_server):
@@ -121,10 +121,10 @@ class LoginRestServlet(RestServlet):
            ({"type": t} for t in self.auth_handler.get_supported_login_types())
        )

-        return (200, {"flows": flows})
+        return 200, {"flows": flows}

    def on_OPTIONS(self, request):
-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_POST(self, request):
@@ -152,7 +152,7 @@ class LoginRestServlet(RestServlet):
        well_known_data = self._well_known_builder.get_well_known()
        if well_known_data:
            result["well_known"] = well_known_data
-        return (200, result)
+        return 200, result

    @defer.inlineCallbacks
    def _do_other_login(self, login_submission):
@@ -33,7 +33,7 @@ class LogoutRestServlet(RestServlet):
        self._device_handler = hs.get_device_handler()

    def on_OPTIONS(self, request):
-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_POST(self, request):
@@ -49,7 +49,7 @@ class LogoutRestServlet(RestServlet):
                requester.user.to_string(), requester.device_id
            )

-        return (200, {})
+        return 200, {}


 class LogoutAllRestServlet(RestServlet):
@@ -62,7 +62,7 @@ class LogoutAllRestServlet(RestServlet):
        self._device_handler = hs.get_device_handler()

    def on_OPTIONS(self, request):
-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_POST(self, request):
@@ -75,7 +75,7 @@ class LogoutAllRestServlet(RestServlet):
        # .. and then delete any access tokens which weren't associated with
        # devices.
        yield self._auth_handler.delete_access_tokens_for_user(user_id)
-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -56,7 +56,7 @@ class PresenceStatusRestServlet(RestServlet):
        state = yield self.presence_handler.get_state(target_user=user)
        state = format_user_presence_state(state, self.clock.time_msec())

-        return (200, state)
+        return 200, state

    @defer.inlineCallbacks
    def on_PUT(self, request, user_id):
@@ -88,10 +88,10 @@ class PresenceStatusRestServlet(RestServlet):
        if self.hs.config.use_presence:
            yield self.presence_handler.set_state(user, state)

-        return (200, {})
+        return 200, {}

    def on_OPTIONS(self, request):
-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -48,7 +48,7 @@ class ProfileDisplaynameRestServlet(RestServlet):
        if displayname is not None:
            ret["displayname"] = displayname

-        return (200, ret)
+        return 200, ret

    @defer.inlineCallbacks
    def on_PUT(self, request, user_id):
@@ -61,14 +61,14 @@ class ProfileDisplaynameRestServlet(RestServlet):
        try:
            new_name = content["displayname"]
        except Exception:
-            return (400, "Unable to parse name")
+            return 400, "Unable to parse name"

        yield self.profile_handler.set_displayname(user, requester, new_name, is_admin)

-        return (200, {})
+        return 200, {}

    def on_OPTIONS(self, request, user_id):
-        return (200, {})
+        return 200, {}


 class ProfileAvatarURLRestServlet(RestServlet):
@@ -98,7 +98,7 @@ class ProfileAvatarURLRestServlet(RestServlet):
        if avatar_url is not None:
            ret["avatar_url"] = avatar_url

-        return (200, ret)
+        return 200, ret

    @defer.inlineCallbacks
    def on_PUT(self, request, user_id):
@@ -110,14 +110,14 @@ class ProfileAvatarURLRestServlet(RestServlet):
        try:
            new_name = content["avatar_url"]
        except Exception:
-            return (400, "Unable to parse name")
+            return 400, "Unable to parse name"

        yield self.profile_handler.set_avatar_url(user, requester, new_name, is_admin)

-        return (200, {})
+        return 200, {}

    def on_OPTIONS(self, request, user_id):
-        return (200, {})
+        return 200, {}


 class ProfileRestServlet(RestServlet):
@@ -150,7 +150,7 @@ class ProfileRestServlet(RestServlet):
        if avatar_url is not None:
            ret["avatar_url"] = avatar_url

-        return (200, ret)
+        return 200, ret


 def register_servlets(hs, http_server):
@@ -69,7 +69,7 @@ class PushRuleRestServlet(RestServlet):
        if "attr" in spec:
            yield self.set_rule_attr(user_id, spec, content)
            self.notify_user(user_id)
-            return (200, {})
+            return 200, {}

        if spec["rule_id"].startswith("."):
            # Rule ids starting with '.' are reserved for server default rules.
@@ -106,7 +106,7 @@ class PushRuleRestServlet(RestServlet):
        except RuleNotFoundException as e:
            raise SynapseError(400, str(e))

-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_DELETE(self, request, path):
@@ -123,7 +123,7 @@ class PushRuleRestServlet(RestServlet):
        try:
            yield self.store.delete_push_rule(user_id, namespaced_rule_id)
            self.notify_user(user_id)
-            return (200, {})
+            return 200, {}
        except StoreError as e:
            if e.code == 404:
                raise NotFoundError()
@@ -151,10 +151,10 @@ class PushRuleRestServlet(RestServlet):
            )

        if path[0] == "":
-            return (200, rules)
+            return 200, rules
        elif path[0] == "global":
            result = _filter_ruleset_with_path(rules["global"], path[1:])
-            return (200, result)
+            return 200, result
        else:
            raise UnrecognizedRequestError()

@@ -62,7 +62,7 @@ class PushersRestServlet(RestServlet):
                if k not in allowed_keys:
                    del p[k]

-        return (200, {"pushers": pushers})
+        return 200, {"pushers": pushers}

    def on_OPTIONS(self, _):
        return 200, {}
@@ -94,7 +94,7 @@ class PushersSetRestServlet(RestServlet):
            yield self.pusher_pool.remove_pusher(
                content["app_id"], content["pushkey"], user_id=user.to_string()
            )
-            return (200, {})
+            return 200, {}

        assert_params_in_dict(
            content,
@@ -143,7 +143,7 @@ class PushersSetRestServlet(RestServlet):

        self.notifier.on_new_replication_data()

-        return (200, {})
+        return 200, {}

    def on_OPTIONS(self, _):
        return 200, {}
@@ -91,14 +91,14 @@ class RoomCreateRestServlet(TransactionRestServlet):
            requester, self.get_room_config(request)
        )

-        return (200, info)
+        return 200, info

    def get_room_config(self, request):
        user_supplied_config = parse_json_object_from_request(request)
        return user_supplied_config

    def on_OPTIONS(self, request):
-        return (200, {})
+        return 200, {}


 # TODO: Needs unit testing for generic events
@@ -173,9 +173,9 @@ class RoomStateEventRestServlet(TransactionRestServlet):

        if format == "event":
            event = format_event_for_client_v2(data.get_dict())
-            return (200, event)
+            return 200, event
        elif format == "content":
-            return (200, data.get_dict()["content"])
+            return 200, data.get_dict()["content"]

    @defer.inlineCallbacks
    def on_PUT(self, request, room_id, event_type, state_key, txn_id=None):
@@ -210,7 +210,7 @@ class RoomStateEventRestServlet(TransactionRestServlet):
        ret = {}
        if event:
            ret = {"event_id": event.event_id}
-        return (200, ret)
+        return 200, ret


 # TODO: Needs unit testing for generic events + feedback
@@ -244,10 +244,10 @@ class RoomSendEventRestServlet(TransactionRestServlet):
            requester, event_dict, txn_id=txn_id
        )

-        return (200, {"event_id": event.event_id})
+        return 200, {"event_id": event.event_id}

    def on_GET(self, request, room_id, event_type, txn_id):
-        return (200, "Not implemented")
+        return 200, "Not implemented"

    def on_PUT(self, request, room_id, event_type, txn_id):
        return self.txns.fetch_or_execute_request(
@@ -307,7 +307,7 @@ class JoinRoomAliasServlet(TransactionRestServlet):
            third_party_signed=content.get("third_party_signed", None),
        )

-        return (200, {"room_id": room_id})
+        return 200, {"room_id": room_id}

    def on_PUT(self, request, room_identifier, txn_id):
        return self.txns.fetch_or_execute_request(
@@ -360,7 +360,7 @@ class PublicRoomListRestServlet(TransactionRestServlet):
                limit=limit, since_token=since_token
            )

-        return (200, data)
+        return 200, data

    @defer.inlineCallbacks
    def on_POST(self, request):
@@ -405,7 +405,7 @@ class PublicRoomListRestServlet(TransactionRestServlet):
                network_tuple=network_tuple,
            )

-        return (200, data)
+        return 200, data


 # TODO: Needs unit testing
@@ -456,7 +456,7 @@ class RoomMemberListRestServlet(RestServlet):
                continue
            chunk.append(event)

-        return (200, {"chunk": chunk})
+        return 200, {"chunk": chunk}


 # deprecated in favour of /members?membership=join?
@@ -477,7 +477,7 @@ class JoinedRoomMemberListRestServlet(RestServlet):
            requester, room_id
        )

-        return (200, {"joined": users_with_profile})
+        return 200, {"joined": users_with_profile}


 # TODO: Needs better unit testing
@@ -510,7 +510,7 @@ class RoomMessageListRestServlet(RestServlet):
            event_filter=event_filter,
        )

-        return (200, msgs)
+        return 200, msgs


 # TODO: Needs unit testing
@@ -531,7 +531,7 @@ class RoomStateRestServlet(RestServlet):
            user_id=requester.user.to_string(),
            is_guest=requester.is_guest,
        )
-        return (200, events)
+        return 200, events


 # TODO: Needs unit testing
@@ -550,7 +550,7 @@ class RoomInitialSyncRestServlet(RestServlet):
        content = yield self.initial_sync_handler.room_initial_sync(
            room_id=room_id, requester=requester, pagin_config=pagination_config
        )
-        return (200, content)
+        return 200, content


 class RoomEventServlet(RestServlet):
@@ -581,7 +581,7 @@ class RoomEventServlet(RestServlet):
        time_now = self.clock.time_msec()
        if event:
            event = yield self._event_serializer.serialize_event(event, time_now)
-            return (200, event)
+            return 200, event

        return SynapseError(404, "Event not found.", errcode=Codes.NOT_FOUND)

@@ -633,7 +633,7 @@ class RoomEventContextServlet(RestServlet):
            results["state"], time_now
        )

-        return (200, results)
+        return 200, results


 class RoomForgetRestServlet(TransactionRestServlet):
@@ -652,7 +652,7 @@ class RoomForgetRestServlet(TransactionRestServlet):

        yield self.room_member_handler.forget(user=requester.user, room_id=room_id)

-        return (200, {})
+        return 200, {}

    def on_PUT(self, request, room_id, txn_id):
        return self.txns.fetch_or_execute_request(
@@ -702,7 +702,7 @@ class RoomMembershipRestServlet(TransactionRestServlet):
                requester,
                txn_id,
            )
-            return (200, {})
+            return 200, {}
            return

        target = requester.user
@@ -729,7 +729,7 @@ class RoomMembershipRestServlet(TransactionRestServlet):
        if membership_action == "join":
            return_value["room_id"] = room_id

-        return (200, return_value)
+        return 200, return_value

    def _has_3pid_invite_keys(self, content):
        for key in {"id_server", "medium", "address"}:
@@ -771,7 +771,7 @@ class RoomRedactEventRestServlet(TransactionRestServlet):
            txn_id=txn_id,
        )

-        return (200, {"event_id": event.event_id})
+        return 200, {"event_id": event.event_id}

    def on_PUT(self, request, room_id, event_id, txn_id):
        return self.txns.fetch_or_execute_request(
@@ -816,7 +816,7 @@ class RoomTypingRestServlet(RestServlet):
                target_user=target_user, auth_user=requester.user, room_id=room_id
            )

-        return (200, {})
+        return 200, {}


 class SearchRestServlet(RestServlet):
@@ -838,7 +838,7 @@ class SearchRestServlet(RestServlet):
            requester.user, content, batch
        )

-        return (200, results)
+        return 200, results


 class JoinedRoomsRestServlet(RestServlet):
@@ -854,7 +854,7 @@ class JoinedRoomsRestServlet(RestServlet):
        requester = yield self.auth.get_user_by_req(request, allow_guest=True)

        room_ids = yield self.store.get_rooms_for_user(requester.user.to_string())
-        return (200, {"joined_rooms": list(room_ids)})
+        return 200, {"joined_rooms": list(room_ids)}


 def register_txn_path(servlet, regex_string, http_server, with_get=False):
@@ -60,7 +60,7 @@ class VoipRestServlet(RestServlet):
            password = turnPassword

        else:
-            return (200, {})
+            return 200, {}

        return (
            200,
@@ -73,7 +73,7 @@ class VoipRestServlet(RestServlet):
        )

    def on_OPTIONS(self, request):
-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -117,7 +117,7 @@ class EmailPasswordRequestTokenRestServlet(RestServlet):
            # Wrap the session id in a JSON object
            ret = {"sid": sid}

-        return (200, ret)
+        return 200, ret

    @defer.inlineCallbacks
    def send_password_reset(self, email, client_secret, send_attempt, next_link=None):
@@ -221,7 +221,7 @@ class MsisdnPasswordRequestTokenRestServlet(RestServlet):
            raise SynapseError(400, "MSISDN not found", Codes.THREEPID_NOT_FOUND)

        ret = yield self.identity_handler.requestMsisdnToken(**body)
-        return (200, ret)
+        return 200, ret


 class PasswordResetSubmitTokenServlet(RestServlet):
@@ -330,7 +330,7 @@ class PasswordResetSubmitTokenServlet(RestServlet):
        )
        response_code = 200 if valid else 400

-        return (response_code, {"success": valid})
+        return response_code, {"success": valid}


 class PasswordRestServlet(RestServlet):
@@ -399,7 +399,7 @@ class PasswordRestServlet(RestServlet):

        yield self._set_password_handler.set_password(user_id, new_password, requester)

-        return (200, {})
+        return 200, {}

    def on_OPTIONS(self, _):
        return 200, {}
@@ -434,7 +434,7 @@ class DeactivateAccountRestServlet(RestServlet):
            yield self._deactivate_account_handler.deactivate_account(
                requester.user.to_string(), erase
            )
-            return (200, {})
+            return 200, {}

        yield self.auth_handler.validate_user_via_ui_auth(
            requester, body, self.hs.get_ip_from_request(request)
@@ -447,7 +447,7 @@ class DeactivateAccountRestServlet(RestServlet):
        else:
            id_server_unbind_result = "no-support"

-        return (200, {"id_server_unbind_result": id_server_unbind_result})
+        return 200, {"id_server_unbind_result": id_server_unbind_result}


 class EmailThreepidRequestTokenRestServlet(RestServlet):
@@ -481,7 +481,7 @@ class EmailThreepidRequestTokenRestServlet(RestServlet):
            raise SynapseError(400, "Email is already in use", Codes.THREEPID_IN_USE)

        ret = yield self.identity_handler.requestEmailToken(**body)
-        return (200, ret)
+        return 200, ret


 class MsisdnThreepidRequestTokenRestServlet(RestServlet):
@@ -516,7 +516,7 @@ class MsisdnThreepidRequestTokenRestServlet(RestServlet):
            raise SynapseError(400, "MSISDN is already in use", Codes.THREEPID_IN_USE)

        ret = yield self.identity_handler.requestMsisdnToken(**body)
-        return (200, ret)
+        return 200, ret


 class ThreepidRestServlet(RestServlet):
@@ -536,7 +536,7 @@ class ThreepidRestServlet(RestServlet):

        threepids = yield self.datastore.user_get_threepids(requester.user.to_string())

-        return (200, {"threepids": threepids})
+        return 200, {"threepids": threepids}

    @defer.inlineCallbacks
    def on_POST(self, request):
@@ -568,7 +568,7 @@ class ThreepidRestServlet(RestServlet):
            logger.debug("Binding threepid %s to %s", threepid, user_id)
            yield self.identity_handler.bind_threepid(threePidCreds, user_id)

-        return (200, {})
+        return 200, {}


 class ThreepidDeleteRestServlet(RestServlet):
@@ -603,7 +603,7 @@ class ThreepidDeleteRestServlet(RestServlet):
        else:
            id_server_unbind_result = "no-support"

-        return (200, {"id_server_unbind_result": id_server_unbind_result})
+        return 200, {"id_server_unbind_result": id_server_unbind_result}


 class WhoamiRestServlet(RestServlet):
@@ -617,7 +617,7 @@ class WhoamiRestServlet(RestServlet):
    def on_GET(self, request):
        requester = yield self.auth.get_user_by_req(request)

-        return (200, {"user_id": requester.user.to_string()})
+        return 200, {"user_id": requester.user.to_string()}


 def register_servlets(hs, http_server):
@@ -55,7 +55,7 @@ class AccountDataServlet(RestServlet):

        self.notifier.on_new_event("account_data_key", max_id, users=[user_id])

-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_GET(self, request, user_id, account_data_type):
@@ -70,7 +70,7 @@ class AccountDataServlet(RestServlet):
        if event is None:
            raise NotFoundError("Account data not found")

-        return (200, event)
+        return 200, event


 class RoomAccountDataServlet(RestServlet):
@@ -112,7 +112,7 @@ class RoomAccountDataServlet(RestServlet):

        self.notifier.on_new_event("account_data_key", max_id, users=[user_id])

-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_GET(self, request, user_id, room_id, account_data_type):
@@ -127,7 +127,7 @@ class RoomAccountDataServlet(RestServlet):
        if event is None:
            raise NotFoundError("Room account data not found")

-        return (200, event)
+        return 200, event


 def register_servlets(hs, http_server):
@@ -58,7 +58,7 @@ class CapabilitiesRestServlet(RestServlet):
                "m.change_password": {"enabled": change_password},
            }
        }
-        return (200, response)
+        return 200, response


 def register_servlets(hs, http_server):
@@ -48,7 +48,7 @@ class DevicesRestServlet(RestServlet):
        devices = yield self.device_handler.get_devices_by_user(
            requester.user.to_string()
        )
-        return (200, {"devices": devices})
+        return 200, {"devices": devices}


 class DeleteDevicesRestServlet(RestServlet):
@@ -91,7 +91,7 @@ class DeleteDevicesRestServlet(RestServlet):
        yield self.device_handler.delete_devices(
            requester.user.to_string(), body["devices"]
        )
-        return (200, {})
+        return 200, {}


 class DeviceRestServlet(RestServlet):
@@ -114,7 +114,7 @@ class DeviceRestServlet(RestServlet):
        device = yield self.device_handler.get_device(
            requester.user.to_string(), device_id
        )
-        return (200, device)
+        return 200, device

    @interactive_auth_handler
    @defer.inlineCallbacks
@@ -137,7 +137,7 @@ class DeviceRestServlet(RestServlet):
        )

        yield self.device_handler.delete_device(requester.user.to_string(), device_id)
-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_PUT(self, request, device_id):
@@ -147,7 +147,7 @@ class DeviceRestServlet(RestServlet):
        yield self.device_handler.update_device(
            requester.user.to_string(), device_id, body
        )
-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -56,7 +56,7 @@ class GetFilterRestServlet(RestServlet):
                user_localpart=target_user.localpart, filter_id=filter_id
            )

-            return (200, filter.get_filter_json())
+            return 200, filter.get_filter_json()
        except (KeyError, StoreError):
            raise SynapseError(400, "No such filter", errcode=Codes.NOT_FOUND)

@@ -89,7 +89,7 @@ class CreateFilterRestServlet(RestServlet):
            user_localpart=target_user.localpart, user_filter=content
        )

-        return (200, {"filter_id": str(filter_id)})
+        return 200, {"filter_id": str(filter_id)}


 def register_servlets(hs, http_server):
@@ -47,7 +47,7 @@ class GroupServlet(RestServlet):
            group_id, requester_user_id
        )

-        return (200, group_description)
+        return 200, group_description

    @defer.inlineCallbacks
    def on_POST(self, request, group_id):
@@ -59,7 +59,7 @@ class GroupServlet(RestServlet):
            group_id, requester_user_id, content
        )

-        return (200, {})
+        return 200, {}


 class GroupSummaryServlet(RestServlet):
@@ -83,7 +83,7 @@ class GroupSummaryServlet(RestServlet):
            group_id, requester_user_id
        )

-        return (200, get_group_summary)
+        return 200, get_group_summary


 class GroupSummaryRoomsCatServlet(RestServlet):
@@ -120,7 +120,7 @@ class GroupSummaryRoomsCatServlet(RestServlet):
            content=content,
        )

-        return (200, resp)
+        return 200, resp

    @defer.inlineCallbacks
    def on_DELETE(self, request, group_id, category_id, room_id):
@@ -131,7 +131,7 @@ class GroupSummaryRoomsCatServlet(RestServlet):
            group_id, requester_user_id, room_id=room_id, category_id=category_id
        )

-        return (200, resp)
+        return 200, resp


 class GroupCategoryServlet(RestServlet):
@@ -157,7 +157,7 @@ class GroupCategoryServlet(RestServlet):
            group_id, requester_user_id, category_id=category_id
        )

-        return (200, category)
+        return 200, category

    @defer.inlineCallbacks
    def on_PUT(self, request, group_id, category_id):
@@ -169,7 +169,7 @@ class GroupCategoryServlet(RestServlet):
            group_id, requester_user_id, category_id=category_id, content=content
        )

-        return (200, resp)
+        return 200, resp

    @defer.inlineCallbacks
    def on_DELETE(self, request, group_id, category_id):
@@ -180,7 +180,7 @@ class GroupCategoryServlet(RestServlet):
            group_id, requester_user_id, category_id=category_id
        )

-        return (200, resp)
+        return 200, resp


 class GroupCategoriesServlet(RestServlet):
@@ -204,7 +204,7 @@ class GroupCategoriesServlet(RestServlet):
            group_id, requester_user_id
        )

-        return (200, category)
+        return 200, category


 class GroupRoleServlet(RestServlet):
@@ -228,7 +228,7 @@ class GroupRoleServlet(RestServlet):
            group_id, requester_user_id, role_id=role_id
        )

-        return (200, category)
+        return 200, category

    @defer.inlineCallbacks
    def on_PUT(self, request, group_id, role_id):
@@ -240,7 +240,7 @@ class GroupRoleServlet(RestServlet):
            group_id, requester_user_id, role_id=role_id, content=content
        )

-        return (200, resp)
+        return 200, resp

    @defer.inlineCallbacks
    def on_DELETE(self, request, group_id, role_id):
@@ -251,7 +251,7 @@ class GroupRoleServlet(RestServlet):
            group_id, requester_user_id, role_id=role_id
        )

-        return (200, resp)
+        return 200, resp


 class GroupRolesServlet(RestServlet):
@@ -275,7 +275,7 @@ class GroupRolesServlet(RestServlet):
            group_id, requester_user_id
        )

-        return (200, category)
+        return 200, category


 class GroupSummaryUsersRoleServlet(RestServlet):
@@ -312,7 +312,7 @@ class GroupSummaryUsersRoleServlet(RestServlet):
            content=content,
        )

-        return (200, resp)
+        return 200, resp

    @defer.inlineCallbacks
    def on_DELETE(self, request, group_id, role_id, user_id):
@@ -323,7 +323,7 @@ class GroupSummaryUsersRoleServlet(RestServlet):
            group_id, requester_user_id, user_id=user_id, role_id=role_id
        )

-        return (200, resp)
+        return 200, resp


 class GroupRoomServlet(RestServlet):
@@ -347,7 +347,7 @@ class GroupRoomServlet(RestServlet):
            group_id, requester_user_id
        )

-        return (200, result)
+        return 200, result


 class GroupUsersServlet(RestServlet):
@@ -371,7 +371,7 @@ class GroupUsersServlet(RestServlet):
            group_id, requester_user_id
        )

-        return (200, result)
+        return 200, result


 class GroupInvitedUsersServlet(RestServlet):
@@ -395,7 +395,7 @@ class GroupInvitedUsersServlet(RestServlet):
            group_id, requester_user_id
        )

-        return (200, result)
+        return 200, result


 class GroupSettingJoinPolicyServlet(RestServlet):
@@ -420,7 +420,7 @@ class GroupSettingJoinPolicyServlet(RestServlet):
            group_id, requester_user_id, content
        )

-        return (200, result)
+        return 200, result


 class GroupCreateServlet(RestServlet):
@@ -450,7 +450,7 @@ class GroupCreateServlet(RestServlet):
            group_id, requester_user_id, content
        )

-        return (200, result)
+        return 200, result


 class GroupAdminRoomsServlet(RestServlet):
@@ -477,7 +477,7 @@ class GroupAdminRoomsServlet(RestServlet):
            group_id, requester_user_id, room_id, content
        )

-        return (200, result)
+        return 200, result

    @defer.inlineCallbacks
    def on_DELETE(self, request, group_id, room_id):
@@ -488,7 +488,7 @@ class GroupAdminRoomsServlet(RestServlet):
            group_id, requester_user_id, room_id
        )

-        return (200, result)
+        return 200, result


 class GroupAdminRoomsConfigServlet(RestServlet):
@@ -516,7 +516,7 @@ class GroupAdminRoomsConfigServlet(RestServlet):
            group_id, requester_user_id, room_id, config_key, content
        )

-        return (200, result)
+        return 200, result


 class GroupAdminUsersInviteServlet(RestServlet):
@@ -546,7 +546,7 @@ class GroupAdminUsersInviteServlet(RestServlet):
            group_id, user_id, requester_user_id, config
        )

-        return (200, result)
+        return 200, result


 class GroupAdminUsersKickServlet(RestServlet):
@@ -573,7 +573,7 @@ class GroupAdminUsersKickServlet(RestServlet):
            group_id, user_id, requester_user_id, content
        )

-        return (200, result)
+        return 200, result


 class GroupSelfLeaveServlet(RestServlet):
@@ -598,7 +598,7 @@ class GroupSelfLeaveServlet(RestServlet):
            group_id, requester_user_id, requester_user_id, content
        )

-        return (200, result)
+        return 200, result


 class GroupSelfJoinServlet(RestServlet):
@@ -623,7 +623,7 @@ class GroupSelfJoinServlet(RestServlet):
            group_id, requester_user_id, content
        )

-        return (200, result)
+        return 200, result


 class GroupSelfAcceptInviteServlet(RestServlet):
@@ -648,7 +648,7 @@ class GroupSelfAcceptInviteServlet(RestServlet):
            group_id, requester_user_id, content
        )

-        return (200, result)
+        return 200, result


 class GroupSelfUpdatePublicityServlet(RestServlet):
@@ -672,7 +672,7 @@ class GroupSelfUpdatePublicityServlet(RestServlet):
        publicise = content["publicise"]
        yield self.store.update_group_publicity(group_id, requester_user_id, publicise)

-        return (200, {})
+        return 200, {}


 class PublicisedGroupsForUserServlet(RestServlet):
@@ -694,7 +694,7 @@ class PublicisedGroupsForUserServlet(RestServlet):

        result = yield self.groups_handler.get_publicised_groups_for_user(user_id)

-        return (200, result)
+        return 200, result


 class PublicisedGroupsForUsersServlet(RestServlet):
@@ -719,7 +719,7 @@ class PublicisedGroupsForUsersServlet(RestServlet):

        result = yield self.groups_handler.bulk_get_publicised_groups(user_ids)

-        return (200, result)
+        return 200, result


 class GroupsForUserServlet(RestServlet):
@@ -741,7 +741,7 @@ class GroupsForUserServlet(RestServlet):

        result = yield self.groups_handler.get_joined_groups(requester_user_id)

-        return (200, result)
+        return 200, result


 def register_servlets(hs, http_server):
@@ -105,7 +105,7 @@ class KeyUploadServlet(RestServlet):
        result = yield self.e2e_keys_handler.upload_keys_for_user(
            user_id, device_id, body
        )
-        return (200, result)
+        return 200, result


 class KeyQueryServlet(RestServlet):
@@ -159,7 +159,7 @@ class KeyQueryServlet(RestServlet):
        timeout = parse_integer(request, "timeout", 10 * 1000)
        body = parse_json_object_from_request(request)
        result = yield self.e2e_keys_handler.query_devices(body, timeout)
-        return (200, result)
+        return 200, result


 class KeyChangesServlet(RestServlet):
@@ -200,7 +200,7 @@ class KeyChangesServlet(RestServlet):

        results = yield self.device_handler.get_user_ids_changed(user_id, from_token)

-        return (200, results)
+        return 200, results


 class OneTimeKeyServlet(RestServlet):
@@ -235,7 +235,7 @@ class OneTimeKeyServlet(RestServlet):
        timeout = parse_integer(request, "timeout", 10 * 1000)
        body = parse_json_object_from_request(request)
        result = yield self.e2e_keys_handler.claim_one_time_keys(body, timeout)
-        return (200, result)
+        return 200, result


 def register_servlets(hs, http_server):
@@ -88,7 +88,7 @@ class NotificationsServlet(RestServlet):
            returned_push_actions.append(returned_pa)
            next_token = str(pa["stream_ordering"])

-        return (200, {"notifications": returned_push_actions, "next_token": next_token})
+        return 200, {"notifications": returned_push_actions, "next_token": next_token}


 def register_servlets(hs, http_server):
@@ -59,7 +59,7 @@ class ReadMarkerRestServlet(RestServlet):
                event_id=read_marker_event_id,
            )

-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -52,7 +52,7 @@ class ReceiptRestServlet(RestServlet):
            room_id, receipt_type, user_id=requester.user.to_string(), event_id=event_id
        )

-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -94,7 +94,7 @@ class EmailRegisterRequestTokenRestServlet(RestServlet):
            raise SynapseError(400, "Email is already in use", Codes.THREEPID_IN_USE)

        ret = yield self.identity_handler.requestEmailToken(**body)
-        return (200, ret)
+        return 200, ret


 class MsisdnRegisterRequestTokenRestServlet(RestServlet):
@@ -137,7 +137,7 @@ class MsisdnRegisterRequestTokenRestServlet(RestServlet):
            )

        ret = yield self.identity_handler.requestMsisdnToken(**body)
-        return (200, ret)
+        return 200, ret


 class UsernameAvailabilityRestServlet(RestServlet):
@@ -177,7 +177,7 @@ class UsernameAvailabilityRestServlet(RestServlet):

            yield self.registration_handler.check_username(username)

-            return (200, {"available": True})
+            return 200, {"available": True}


 class RegisterRestServlet(RestServlet):
@@ -279,7 +279,7 @@ class RegisterRestServlet(RestServlet):
                result = yield self._do_appservice_registration(
                    desired_username, access_token, body
                )
-            return (200, result)  # we throw for non 200 responses
+            return 200, result  # we throw for non 200 responses
            return

        # for regular registration, downcase the provided username before
@@ -487,7 +487,7 @@ class RegisterRestServlet(RestServlet):
                bind_msisdn=params.get("bind_msisdn"),
            )

-        return (200, return_dict)
+        return 200, return_dict

    def on_OPTIONS(self, _):
        return 200, {}
@@ -118,7 +118,7 @@ class RelationSendServlet(RestServlet):
            requester, event_dict=event_dict, txn_id=txn_id
        )

-        return (200, {"event_id": event.event_id})
+        return 200, {"event_id": event.event_id}


 class RelationPaginationServlet(RestServlet):
@@ -198,7 +198,7 @@ class RelationPaginationServlet(RestServlet):
        return_value["chunk"] = events
        return_value["original_event"] = original_event

-        return (200, return_value)
+        return 200, return_value


 class RelationAggregationPaginationServlet(RestServlet):
@@ -270,7 +270,7 @@ class RelationAggregationPaginationServlet(RestServlet):
                to_token=to_token,
            )

-        return (200, pagination_chunk.to_dict())
+        return 200, pagination_chunk.to_dict()


 class RelationAggregationGroupPaginationServlet(RestServlet):
@@ -356,7 +356,7 @@ class RelationAggregationGroupPaginationServlet(RestServlet):
        return_value = result.to_dict()
        return_value["chunk"] = events

-        return (200, return_value)
+        return 200, return_value


 def register_servlets(hs, http_server):
@@ -72,7 +72,7 @@ class ReportEventRestServlet(RestServlet):
            received_ts=self.clock.time_msec(),
        )

-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -135,7 +135,7 @@ class RoomKeysServlet(RestServlet):
            body = {"rooms": {room_id: body}}

        yield self.e2e_room_keys_handler.upload_room_keys(user_id, version, body)
-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_GET(self, request, room_id, session_id):
@@ -218,7 +218,7 @@ class RoomKeysServlet(RestServlet):
            else:
                room_keys = room_keys["rooms"][room_id]

-        return (200, room_keys)
+        return 200, room_keys

    @defer.inlineCallbacks
    def on_DELETE(self, request, room_id, session_id):
@@ -242,7 +242,7 @@ class RoomKeysServlet(RestServlet):
        yield self.e2e_room_keys_handler.delete_room_keys(
            user_id, version, room_id, session_id
        )
-        return (200, {})
+        return 200, {}


 class RoomKeysNewVersionServlet(RestServlet):
@@ -293,7 +293,7 @@ class RoomKeysNewVersionServlet(RestServlet):
        info = parse_json_object_from_request(request)

        new_version = yield self.e2e_room_keys_handler.create_version(user_id, info)
-        return (200, {"version": new_version})
+        return 200, {"version": new_version}

    # we deliberately don't have a PUT /version, as these things really should
    # be immutable to avoid people footgunning
@@ -338,7 +338,7 @@ class RoomKeysVersionServlet(RestServlet):
        except SynapseError as e:
            if e.code == 404:
                raise SynapseError(404, "No backup found", Codes.NOT_FOUND)
-        return (200, info)
+        return 200, info

    @defer.inlineCallbacks
    def on_DELETE(self, request, version):
@@ -358,7 +358,7 @@ class RoomKeysVersionServlet(RestServlet):
        user_id = requester.user.to_string()

        yield self.e2e_room_keys_handler.delete_version(user_id, version)
-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_PUT(self, request, version):
@@ -392,7 +392,7 @@ class RoomKeysVersionServlet(RestServlet):
            )

        yield self.e2e_room_keys_handler.update_version(user_id, version, info)
-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -80,7 +80,7 @@ class RoomUpgradeRestServlet(RestServlet):

        ret = {"replacement_room": new_room_id}

-        return (200, ret)
+        return 200, ret


 def register_servlets(hs, http_server):
@@ -174,7 +174,7 @@ class SyncRestServlet(RestServlet):
            time_now, sync_result, requester.access_token_id, filter
        )

-        return (200, response_content)
+        return 200, response_content

    @defer.inlineCallbacks
    def encode_response(self, time_now, sync_result, access_token_id, filter):
@@ -45,7 +45,7 @@ class TagListServlet(RestServlet):

        tags = yield self.store.get_tags_for_room(user_id, room_id)

-        return (200, {"tags": tags})
+        return 200, {"tags": tags}


 class TagServlet(RestServlet):
@@ -76,7 +76,7 @@ class TagServlet(RestServlet):

        self.notifier.on_new_event("account_data_key", max_id, users=[user_id])

-        return (200, {})
+        return 200, {}

    @defer.inlineCallbacks
    def on_DELETE(self, request, user_id, room_id, tag):
@@ -88,7 +88,7 @@ class TagServlet(RestServlet):

        self.notifier.on_new_event("account_data_key", max_id, users=[user_id])

-        return (200, {})
+        return 200, {}


 def register_servlets(hs, http_server):
@@ -40,7 +40,7 @@ class ThirdPartyProtocolsServlet(RestServlet):
        yield self.auth.get_user_by_req(request, allow_guest=True)

        protocols = yield self.appservice_handler.get_3pe_protocols()
-        return (200, protocols)
+        return 200, protocols


 class ThirdPartyProtocolServlet(RestServlet):
@@ -60,9 +60,9 @@ class ThirdPartyProtocolServlet(RestServlet):
            only_protocol=protocol
        )
        if protocol in protocols:
-            return (200, protocols[protocol])
+            return 200, protocols[protocol]
        else:
-            return (404, {"error": "Unknown protocol"})
+            return 404, {"error": "Unknown protocol"}


 class ThirdPartyUserServlet(RestServlet):
@@ -85,7 +85,7 @@ class ThirdPartyUserServlet(RestServlet):
            ThirdPartyEntityKind.USER, protocol, fields
        )

-        return (200, results)
+        return 200, results


 class ThirdPartyLocationServlet(RestServlet):
@@ -108,7 +108,7 @@ class ThirdPartyLocationServlet(RestServlet):
            ThirdPartyEntityKind.LOCATION, protocol, fields
        )

-        return (200, results)
+        return 200, results


 def register_servlets(hs, http_server):
@@ -60,7 +60,7 @@ class UserDirectorySearchRestServlet(RestServlet):
        user_id = requester.user.to_string()

        if not self.hs.config.user_directory_search_enabled:
-            return (200, {"limited": False, "results": []})
+            return 200, {"limited": False, "results": []}

        body = parse_json_object_from_request(request)

@@ -76,7 +76,7 @@ class UserDirectorySearchRestServlet(RestServlet):
            user_id, search_term, limit
        )

-        return (200, results)
+        return 200, results


 def register_servlets(hs, http_server):
@@ -44,7 +44,12 @@ class VersionsRestServlet(RestServlet):
                    "r0.5.0",
                ],
                # as per MSC1497:
-                "unstable_features": {"m.lazy_load_members": True},
+                "unstable_features": {
+                    "m.lazy_load_members": True,
+                    # as per https://github.com/matrix-org/synapse/issues/5927
+                    # to be removed in r0.6.0
+                    "m.id_access_token": True,
+                },
            },
        )

@@ -318,14 +318,14 @@ class MediaRepository(object):

            responder = yield self.media_storage.fetch_media(file_info)
            if responder:
-                return (responder, media_info)
+                return responder, media_info

        # Failed to find the file anywhere, lets download it.

        media_info = yield self._download_remote_file(server_name, media_id, file_id)

        responder = yield self.media_storage.fetch_media(file_info)
-        return (responder, media_info)
+        return responder, media_info

    @defer.inlineCallbacks
    def _download_remote_file(self, server_name, media_id, file_id):
@@ -78,9 +78,9 @@ class Thumbnailer(object):
        """

        if max_width * self.height < max_height * self.width:
-            return (max_width, (max_width * self.height) // self.width)
+            return max_width, (max_width * self.height) // self.width
        else:
-            return ((max_height * self.width) // self.height, max_height)
+            return (max_height * self.width) // self.height, max_height

    def scale(self, width, height, output_type):
        """Rescales the image to the given dimensions.
@@ -193,4 +193,4 @@ class ResourceLimitsServerNotices(object):
                if event_id in referenced_events:
                    referenced_events.remove(event.event_id)

-        return (currently_blocked, referenced_events)
+        return currently_blocked, referenced_events
@@ -90,7 +90,7 @@ class AccountDataWorkerStore(SQLBaseStore):
                room_data = by_room.setdefault(row["room_id"], {})
                room_data[row["account_data_type"]] = json.loads(row["content"])

-            return (global_account_data, by_room)
+            return global_account_data, by_room

        return self.runInteraction(
            "get_account_data_for_user", get_account_data_for_user_txn
@@ -205,7 +205,7 @@ class AccountDataWorkerStore(SQLBaseStore):
            )
            txn.execute(sql, (last_room_id, current_id, limit))
            room_results = txn.fetchall()
-            return (global_results, room_results)
+            return global_results, room_results

        return self.runInteraction(
            "get_all_updated_account_data_txn", get_updated_account_data_txn
@@ -244,13 +244,13 @@ class AccountDataWorkerStore(SQLBaseStore):
                room_account_data = account_data_by_room.setdefault(row[0], {})
                room_account_data[row[1]] = json.loads(row[2])

-            return (global_account_data, account_data_by_room)
+            return global_account_data, account_data_by_room

        changed = self._account_data_stream_cache.has_entity_changed(
            user_id, int(stream_id)
        )
        if not changed:
-            return ({}, {})
+            return {}, {}

        return self.runInteraction(
            "get_updated_account_data_for_user", get_updated_account_data_for_user_txn
@@ -358,7 +358,7 @@ class ApplicationServiceTransactionWorkerStore(

        events = yield self.get_events_as_list(event_ids)

-        return (upper_bound, events)
+        return upper_bound, events


 class ApplicationServiceTransactionStore(ApplicationServiceTransactionWorkerStore):
@@ -66,7 +66,7 @@ class DeviceInboxWorkerStore(SQLBaseStore):
                messages.append(json.loads(row[1]))
            if len(messages) < limit:
                stream_pos = current_stream_id
-            return (messages, stream_pos)
+            return messages, stream_pos

        return self.runInteraction(
            "get_new_messages_for_device", get_new_messages_for_device_txn
@@ -157,7 +157,7 @@ class DeviceInboxWorkerStore(SQLBaseStore):
                messages.append(json.loads(row[1]))
            if len(messages) < limit:
                stream_pos = current_stream_id
-            return (messages, stream_pos)
+            return messages, stream_pos

        return self.runInteraction(
            "get_new_device_msgs_for_remote",
@@ -94,7 +94,7 @@ class DeviceWorkerStore(SQLBaseStore):
            destination, int(from_stream_id)
        )
        if not has_changed:
-            return (now_stream_id, [])
+            return now_stream_id, []

        # We retrieve n+1 devices from the list of outbound pokes where n is
        # our outbound device update limit. We then check if the very last
@@ -117,7 +117,7 @@ class DeviceWorkerStore(SQLBaseStore):

        # Return an empty list if there are no updates
        if not updates:
-            return (now_stream_id, [])
+            return now_stream_id, []

        # if we have exceeded the limit, we need to exclude any results with the
        # same stream_id as the last row.
@@ -167,13 +167,13 @@ class DeviceWorkerStore(SQLBaseStore):
        # skip that stream_id and return an empty list, and continue with the next
        # stream_id next time.
        if not query_map:
-            return (stream_id_cutoff, [])
+            return stream_id_cutoff, []

        results = yield self._get_device_update_edus_by_remote(
            destination, from_stream_id, query_map
        )

-        return (now_stream_id, results)
+        return now_stream_id, results

    def _get_devices_by_remote_txn(
        self, txn, destination, from_stream_id, now_stream_id, limit
@@ -352,7 +352,7 @@ class DeviceWorkerStore(SQLBaseStore):
            else:
                results[user_id] = yield self._get_cached_devices_for_user(user_id)

-        return (user_ids_not_in_cache, results)
+        return user_ids_not_in_cache, results

    @cachedInlineCallbacks(num_args=2, tree=True)
    def _get_cached_user_device(self, user_id, device_id):
@@ -810,7 +810,7 @@ class EventsStore(
        # If they old and new groups are the same then we don't need to do
        # anything.
        if old_state_groups == new_state_groups:
-            return (None, None)
+            return None, None

        if len(new_state_groups) == 1 and len(old_state_groups) == 1:
            # If we're going from one state group to another, lets check if
@@ -827,7 +827,7 @@ class EventsStore(
                # the current state in memory then lets also return that,
                # but it doesn't matter if we don't.
                new_state = state_groups_map.get(new_state_group)
-                return (new_state, delta_ids)
+                return new_state, delta_ids

        # Now that we have calculated new_state_groups we need to get
        # their state IDs so we can resolve to a single state set.
@@ -839,7 +839,7 @@ class EventsStore(
        if len(new_state_groups) == 1:
            # If there is only one state group, then we know what the current
            # state is.
-            return (state_groups_map[new_state_groups.pop()], None)
+            return state_groups_map[new_state_groups.pop()], None

        # Ok, we need to defer to the state handler to resolve our state sets.

@@ -868,7 +868,7 @@ class EventsStore(
            state_res_store=StateResolutionStore(self),
        )

-        return (res.state, None)
+        return res.state, None

    @defer.inlineCallbacks
    def _calculate_state_delta(self, room_id, current_state):
@@ -891,7 +891,7 @@ class EventsStore(
            if ev_id != existing_state.get(key)
        }

-        return (to_delete, to_insert)
+        return to_delete, to_insert

    @log_function
    def _persist_events_txn(
@@ -90,7 +90,7 @@ class PresenceStore(SQLBaseStore):
                presence_states,
            )

-        return (stream_orderings[-1], self._presence_id_gen.get_current_token())
+        return stream_orderings[-1], self._presence_id_gen.get_current_token()

    def _update_presence_txn(self, txn, stream_orderings, presence_states):
        for stream_id, state in zip(stream_orderings, presence_states):
@@ -133,7 +133,7 @@ class PusherWorkerStore(SQLBaseStore):
            txn.execute(sql, (last_id, current_id, limit))
            deleted = txn.fetchall()

-            return (updated, deleted)
+            return updated, deleted

        return self.runInteraction(
            "get_all_updated_pushers", get_all_updated_pushers_txn
@@ -478,7 +478,7 @@ class ReceiptsStore(ReceiptsWorkerStore):

        max_persisted_id = self._receipts_id_gen.get_current_token()

-        return (stream_id, max_persisted_id)
+        return stream_id, max_persisted_id

    def insert_graph_receipt(self, room_id, receipt_type, user_id, event_ids, data):
        return self.runInteraction(
@@ -364,7 +364,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
            the chunk of events returned.
        """
        if from_key == to_key:
-            return ([], from_key)
+            return [], from_key

        from_id = RoomStreamToken.parse_stream_token(from_key).stream
        to_id = RoomStreamToken.parse_stream_token(to_key).stream
@@ -374,7 +374,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
        )

        if not has_changed:
-            return ([], from_key)
+            return [], from_key

        def f(txn):
            sql = (
@@ -407,7 +407,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
            # get.
            key = from_key

-        return (ret, key)
+        return ret, key

    @defer.inlineCallbacks
    def get_membership_changes_for_user(self, user_id, from_key, to_key):
@@ -496,7 +496,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
        """
        # Allow a zero limit here, and no-op.
        if limit == 0:
-            return ([], end_token)
+            return [], end_token

        end_token = RoomStreamToken.parse(end_token)

@@ -511,7 +511,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
        # We want to return the results in ascending order.
        rows.reverse()

-        return (rows, token)
+        return rows, token

    def get_room_event_after_stream_ordering(self, room_id, stream_ordering):
        """Gets details of the first event in a room at or after a stream ordering
@@ -783,7 +783,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):

        events = yield self.get_events_as_list(event_ids)

-        return (upper_bound, events)
+        return upper_bound, events

    def get_federation_out_pos(self, typ):
        return self._simple_select_one_onecol(
@@ -195,6 +195,6 @@ class ChainedIdGenerator(object):
        with self._lock:
            if self._unfinished_ids:
                stream_id, chained_id = self._unfinished_ids[0]
-                return (stream_id - 1, chained_id)
+                return stream_id - 1, chained_id

-            return (self._current_max, self.chained_generator.get_current_token())
+            return self._current_max, self.chained_generator.get_current_token()
@@ -37,7 +37,7 @@ class SourcePaginationConfig(object):
        self.limit = min(int(limit), MAX_LIMIT) if limit is not None else None

    def __repr__(self):
-        return ("StreamConfig(from_key=%r, to_key=%r, direction=%r, limit=%r)") % (
+        return "StreamConfig(from_key=%r, to_key=%r, direction=%r, limit=%r)" % (
            self.from_key,
            self.to_key,
            self.direction,
@@ -283,4 +283,4 @@ class RegistrationTestCase(unittest.HomeserverTestCase):
                user, requester, displayname, by_admin=True
            )

-        return (user_id, token)
+        return user_id, token
@@ -472,7 +472,7 @@ class AccountValidityRenewalByEmailTestCase(unittest.HomeserverTestCase):
                added_at=now,
            )
        )
-        return (user_id, tok)
+        return user_id, tok

    def test_manual_email_send_expired_account(self):
        user_id = self.register_user("kermit", "monkey")
@@ -338,7 +338,7 @@ def setup_test_homeserver(cleanup_func, *args, **kwargs):
 def get_clock():
    clock = ThreadedMemoryReactorClock()
    hs_clock = Clock(clock)
-    return (clock, hs_clock)
+    return clock, hs_clock


@attr.s(cmp=False)
@@ -57,7 +57,7 @@ class JsonResourceTests(unittest.TestCase):

        def _callback(request, **kwargs):
            got_kwargs.update(kwargs)
-            return (200, kwargs)
+            return 200, kwargs

        res = JsonResource(self.homeserver)
        res.register_paths(
@@ -106,7 +106,7 @@ class StateGroupStore(object):
        }

    def get_state_group_delta(self, name):
-        return (None, None)
+        return None, None

    def register_events(self, events):
        for e in events:
@@ -464,7 +464,7 @@ class MockHttpResource(HttpServer):
                    args = [urlparse.unquote(u) for u in matcher.groups()]

                    (code, response) = yield func(mock_request, *args)
-                    return (code, response)
+                    return code, response
                except CodeMessageException as e:
                    return (e.code, cs_error(e.msg, code=e.errcode))
Author	SHA1	Message	Date
Andrew Morgan	460f09d32a	Merge branch 'develop' into anoa/v2_is	2019-09-02 11:54:41 +01:00
Aaron Raimist	cee00a3584	Update INSTALL.md to say that Python 2 is no longer supported (#5953 ) Signed-off-by: Aaron Raimist <aaron@raim.ist>	2019-09-02 11:27:39 +01:00
Andrew Morgan	bed1e94ca0	Merge branch 'develop' into anoa/v2_is	2019-08-30 17:36:38 +01:00
Andrew Morgan	0766ef23cf	Merge branch 'anoa/m_id_access_token' into anoa/v2_is	2019-08-30 17:18:57 +01:00
Andrew Morgan	2a012e8a04	Revert "Add m.id_access_token flag (#5930 )" (#5945 ) This reverts commit `4765f0cfd9`.	2019-08-30 17:13:37 +01:00
Andrew Morgan	4548d1f87e	Remove unnecessary parentheses around return statements (#5931 ) Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :)	2019-08-30 16:28:26 +01:00
Amber Brown	4fca313389	Move buildkite config to the pipelines repo (#5943 )	2019-08-31 01:01:57 +10:00
Andrew Morgan	4765f0cfd9	Add m.id_access_token flag (#5930 ) Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043 Fixes #5927	2019-08-30 15:22:51 +01:00
Amber Brown	d19505a8c1	Removed unused jenkins/ folder and script (#5938 )	2019-08-30 23:13:16 +10:00
Andrew Morgan	2be726a4dd	Merge branch 'develop' into anoa/v2_is	2019-08-30 13:18:37 +01:00
Andrew Morgan	3057095a5d	Revert "Use the v2 lookup API for 3PID invites (#5897 )" (#5937 ) This reverts commit `71fc04069a`. This broke 3PID invites as #5892 was required for it to work correctly.	2019-08-30 12:00:20 +01:00
Andrew Morgan	a578c422f4	Merge branch 'develop' into anoa/m_id_access_token	2019-08-30 10:33:00 +01:00
Andrew Morgan	60e447d627	Merge branch 'develop' into anoa/m_id_access_token	2019-08-29 13:40:26 +01:00
Andrew Morgan	6fcab5b4cf	Add changelog	2019-08-29 11:56:15 +01:00
Andrew Morgan	a640aa6e18	Add m.id_access_token flag	2019-08-29 11:53:49 +01:00
Andrew Morgan	849d8dc19f	Merge branch 'anoa/v2_lookup' of github.com:matrix-org/synapse into anoa/v2_lookup	2019-08-28 13:44:02 +01:00
Andrew Morgan	4dc08495b8	lint	2019-08-28 13:43:52 +01:00
Andrew Morgan	8f1346d82b	Apply suggestions from code review Co-Authored-By: Erik Johnston <erik@matrix.org>	2019-08-28 14:43:05 +02:00
Andrew Morgan	38dac2774f	Warn user when the id_server they chose does not support any of the hs' desired lookup algos	2019-08-28 13:41:29 +01:00
Andrew Morgan	e68d648594	small fixes and remove unnecessary Enum	2019-08-28 11:10:32 +01:00
Andrew Morgan	75ef0f8b1d	lint	2019-08-27 13:08:14 +01:00
Andrew Morgan	7bfccadf31	Address review comments	2019-08-27 13:06:29 +01:00
Andrew Morgan	2472e2e40d	lint	2019-08-21 18:24:37 +02:00
Andrew Morgan	73fb6f3723	Continue to support v1 lookup	2019-08-21 18:23:34 +02:00
Andrew Morgan	5426e13168	Merge branch 'develop' into anoa/v2_lookup * develop: Drop some unused tables. (#5893) Avoid deep recursion in appservice recovery (#5885) Opentracing doc update (#5776) Refactor the Appservice scheduler code	2019-08-21 18:15:59 +02:00
Andrew Morgan	3a114fe105	linter fight	2019-08-21 16:31:06 +02:00
Andrew Morgan	902ef397af	add changelog	2019-08-21 16:29:06 +02:00
Andrew Morgan	24ee3aecd5	lint	2019-08-21 16:27:42 +02:00
Andrew Morgan	1954438610	Use the v2 lookup API	2019-08-21 16:25:00 +02:00
				`@@ -0,0 +1 @@`
				`Add temporary flag to /versions in unstable_features to indicate this Synapse supports receiving id_access_token parameters on calls to identity server-proxying endpoints.`
				`@@ -0,0 +1 @@`
				`Remove unnecessary parentheses in return statements.`
				`@@ -0,0 +1 @@`
				`Remove unused jenkins/prepare_sytest.sh file.`
				`@@ -0,0 +1 @@`
				`Move Buildkite pipeline config to the pipelines repo.`
				`@@ -0,0 +1 @@`
				`Update INSTALL.md to say that Python 2 is no longer supported.`