From cda4ff85198fd68ba10905e90f3e7172fe24559b Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 22 Aug 2014 18:23:02 +0100
Subject: Oops, we need to use defer.returnValue.

---
 synapse/handlers/presence.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index bccb24a109..c88cc18788 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -142,7 +142,8 @@ class PresenceHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def is_presence_visible(self, observer_user, observed_user):
-        return defer.succeed(True)
+        defer.returnValue(True)
+        return
         # FIXME (erikj): This code path absolutely kills the database.
 
         assert(observed_user.is_mine)
-- 
cgit 1.4.1