From a88bc67f88bf5b932283372818c7e33bedfbaa0b Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 11 Nov 2016 15:02:29 +0000
Subject: [PATCH] Flake8 and fix whoopsie
---
synapse/rest/client/v1/room.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index 47c4b84b73..a866615f71 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -224,7 +224,9 @@ class RoomSendEventRestServlet(ClientV1RestServlet):
except KeyError:
pass
- res_deferred = ObservableDeferred(self.on_POST(request, room_id, event_type, txn_id))
+ res_deferred = ObservableDeferred(
+ self.on_POST(request, room_id, event_type, txn_id)
+ )
self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred.observe()
defer.returnValue(response)
@@ -625,13 +627,13 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks
def on_PUT(self, request, room_id, membership_action, txn_id):
try:
- res_deferred = ObservableDeferred(self.txns.get_client_transaction(request, txn_id))
+ res_deferred = self.txns.get_client_transaction(request, txn_id)
res = yield res_deferred.observe()
defer.returnValue(res)
except KeyError:
pass
- res_deferred = ObservableDeffself.on_POST(request, room_id, membership_action, txn_id)
+ res_deferred = ObservableDeferred(self.on_POST(request, room_id, membership_action, txn_id))
self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred.observe()
defer.returnValue(response)
@@ -675,7 +677,9 @@ class RoomRedactEventRestServlet(ClientV1RestServlet):
except KeyError:
pass
- res_deferred = ObservableDeferred(self.on_POST(request, room_id, event_id, txn_id))
+ res_deferred = ObservableDeferred(
+ self.on_POST(request, room_id, event_id, txn_id)
+ )
self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred.observe()
defer.returnValue(response)
--
GitLab