diff options
| author | Luke Barnard <lukeb@openmarket.com> | 2017-04-11 17:07:07 +0100 |
|---|---|---|
| committer | Luke Barnard <lukeb@openmarket.com> | 2017-04-11 17:07:07 +0100 |
| commit | 012742302748a231593222beffc5ceff61966ffc (patch) | |
| tree | c509f09eca1bc96a62f7002924923472a5cd2580 | |
| parent | Finish implementing RM endpoint (diff) | |
| download | synapse-012742302748a231593222beffc5ceff61966ffc.tar.xz | |
flake8
| -rw-r--r-- | synapse/handlers/read_marker.py | 3 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/account_data.py | 3 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/read_marker.py | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/synapse/handlers/read_marker.py b/synapse/handlers/read_marker.py index 021faff376..a97f6b9a79 100644 --- a/synapse/handlers/read_marker.py +++ b/synapse/handlers/read_marker.py @@ -17,14 +17,13 @@ from ._base import BaseHandler from twisted.internet import defer -from synapse.util.logcontext import PreserveLoggingContext from synapse.util.async import Linearizer -from synapse.types import get_domain_from_id from synapse.api.errors import SynapseError import logging logger = logging.getLogger(__name__) + class ReadMarkerHandler(BaseHandler): def __init__(self, hs): super(ReadMarkerHandler, self).__init__(hs) diff --git a/synapse/rest/client/v2_alpha/account_data.py b/synapse/rest/client/v2_alpha/account_data.py index a846ab1dc1..56cd347e78 100644 --- a/synapse/rest/client/v2_alpha/account_data.py +++ b/synapse/rest/client/v2_alpha/account_data.py @@ -83,7 +83,8 @@ class RoomAccountDataServlet(RestServlet): body = parse_json_object_from_request(request) if account_data_type == "m.read_marker": - raise SynapseError(405, + raise SynapseError( + 405, "Cannot set m.read_marker through this API. " "Use /rooms/!roomId:server.name/read_marker" ) diff --git a/synapse/rest/client/v2_alpha/read_marker.py b/synapse/rest/client/v2_alpha/read_marker.py index 49ada9c047..a568a9252a 100644 --- a/synapse/rest/client/v2_alpha/read_marker.py +++ b/synapse/rest/client/v2_alpha/read_marker.py @@ -15,7 +15,6 @@ from twisted.internet import defer -from synapse.api.errors import SynapseError from synapse.http.servlet import RestServlet, parse_json_object_from_request from ._base import client_v2_patterns @@ -45,7 +44,7 @@ class ReadMarkerRestServlet(RestServlet): body = parse_json_object_from_request(request) if "m.read" in body: - read_event_id = body["m.read"]; + read_event_id = body["m.read"] yield self.receipts_handler.received_client_receipt( room_id, "m.read", |