OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Flake8 and fix whoopsie

pull/1624/head
Kegan Dougal 2016-11-11 15:02:29 +00:00
parent 42c43cfafd
commit a88bc67f88
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/rest/client/v1/room.py
View File

@ -224,7 +224,9 @@ class RoomSendEventRestServlet(ClientV1RestServlet):
except KeyError: except KeyError:
pass 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) self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred.observe() response = yield res_deferred.observe()
defer.returnValue(response) defer.returnValue(response)
@ -625,13 +627,13 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks @defer.inlineCallbacks
def on_PUT(self, request, room_id, membership_action, txn_id): def on_PUT(self, request, room_id, membership_action, txn_id):
try: 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() res = yield res_deferred.observe()
defer.returnValue(res) defer.returnValue(res)
except KeyError: except KeyError:
pass 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) self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred.observe() response = yield res_deferred.observe()
defer.returnValue(response) defer.returnValue(response)
@ -675,7 +677,9 @@ class RoomRedactEventRestServlet(ClientV1RestServlet):
except KeyError: except KeyError:
pass 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) self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred.observe() response = yield res_deferred.observe()
defer.returnValue(response) defer.returnValue(response)