summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-16 15:24:03 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-16 15:24:03 +0000
commit3c7857e49b8dcad723d52174aba77c47453c0298 (patch)
tree96091f56e7fe5c91540a3390baa0eeb0d1e171c6 /synapse/rest
parentRemove annotate_event_with_state as nothing was using it. Update state tests ... (diff)
downloadsynapse-3c7857e49b8dcad723d52174aba77c47453c0298.tar.xz
clean up coding style a bit
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/room.py8
-rw-r--r--synapse/rest/transactions.py1
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):