From cd087a265db8037ce2fe158ddc0e9b35a612d4bb Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 5 Apr 2018 17:14:27 +0100
Subject: [PATCH] Don't use redundant inlineCallbacks

---
 synapse/storage/group_server.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py
index 8bd8ca8124..da05ccb027 100644
--- a/synapse/storage/group_server.py
+++ b/synapse/storage/group_server.py
@@ -48,9 +48,8 @@ class GroupServerStore(SQLBaseStore):
             desc="set_group_join_policy",
         )
 
-    @defer.inlineCallbacks
     def get_group(self, group_id):
-        ret = yield self._simple_select_one(
+        return self._simple_select_one(
             table="groups",
             keyvalues={
                 "group_id": group_id,
@@ -63,8 +62,6 @@ class GroupServerStore(SQLBaseStore):
             desc="get_group",
         )
 
-        defer.returnValue(ret)
-
     def get_users_in_group(self, group_id, include_private=False):
         # TODO: Pagination