diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-16 18:35:46 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-16 18:35:46 +0000 |
| commit | f76269392b17d2dbabc85579300d9eef9a559d4e (patch) | |
| tree | 94036377e17568e6983d6aeb2a73b827a277a580 /synapse/rest | |
| parent | Use is_outlier() so that we don't get AttributeError (diff) | |
| parent | Merge branch 'release-v0.6.0' into develop (diff) | |
| download | synapse-f76269392b17d2dbabc85579300d9eef9a559d4e.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0
Conflicts: synapse/state.py
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/room.py | 8 | ||||
| -rw-r--r-- | synapse/rest/transactions.py | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 0e2d5fbaae..005a9f6f44 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -310,8 +310,8 @@ class RoomMessageListRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id): user = yield self.auth.get_user_by_req(request) - pagination_config = PaginationConfig.from_request(request, - default_limit=10, + pagination_config = PaginationConfig.from_request( + request, default_limit=10, ) with_feedback = "feedback" in request.args handler = self.handlers.message_handler @@ -466,7 +466,9 @@ class RoomRedactEventRestServlet(RestServlet): class RoomTypingRestServlet(RestServlet): - PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/typing/(?P<user_id>[^/]*)$") + PATTERN = client_path_pattern( + "/rooms/(?P<room_id>[^/]*)/typing/(?P<user_id>[^/]*)$" + ) @defer.inlineCallbacks def on_PUT(self, request, room_id, user_id): diff --git a/synapse/rest/transactions.py b/synapse/rest/transactions.py index 8c41ab4edb..31377bd41d 100644 --- a/synapse/rest/transactions.py +++ b/synapse/rest/transactions.py @@ -19,6 +19,7 @@ import logging logger = logging.getLogger(__name__) + # FIXME: elsewhere we use FooStore to indicate something in the storage layer... class HttpTransactionStore(object): |