From e3417bbbe0d40d17eec9f07981359d081c9b1f9d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 17 Apr 2015 16:13:14 +0100
Subject: [PATCH] Revert needless change to storage.profile

---
 synapse/storage/profile.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/synapse/storage/profile.py b/synapse/storage/profile.py
index 047698aa13..a6e52cb248 100644
--- a/synapse/storage/profile.py
+++ b/synapse/storage/profile.py
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from twisted.internet import defer
-
 from ._base import SQLBaseStore
 
 
@@ -26,17 +24,14 @@ class ProfileStore(SQLBaseStore):
             desc="create_profile",
         )
 
-    @defer.inlineCallbacks
     def get_profile_displayname(self, user_localpart):
-        name = yield self._simple_select_one_onecol(
+        return self._simple_select_one_onecol(
             table="profiles",
             keyvalues={"user_id": user_localpart},
             retcol="displayname",
             desc="get_profile_displayname",
         )
 
-        defer.returnValue(name)
-
     def set_profile_displayname(self, user_localpart, new_displayname):
         return self._simple_update_one(
             table="profiles",