summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 16:03:56 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 16:03:56 +0100
commit3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd (patch)
treee8ababe0e0b7beb91e31d6687f1fb6ad10b73193 /synapse/rest
parentMerge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff)
parentFix pyflakes errors (diff)
downloadsynapse-3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index 731317227d..6771da8fcd 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -249,7 +249,7 @@ class FeedbackRestServlet(RestServlet):
     @defer.inlineCallbacks
     def on_GET(self, request, room_id, msg_sender_id, msg_id, fb_sender_id,
                feedback_type):
-        user = yield (self.auth.get_user_by_req(request))
+        yield (self.auth.get_user_by_req(request))
 
         # TODO (erikj): Implement this?
         raise NotImplementedError("Getting feedback is not supported")