summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorLuke Barnard <luke@matrix.org>2018-04-05 17:14:27 +0100
committerLuke Barnard <luke@matrix.org>2018-04-06 15:43:27 +0100
commitcd087a265db8037ce2fe158ddc0e9b35a612d4bb (patch)
tree1ab0be6af3f2de40a4fb135d5b7ee7ceb5444375 /synapse/storage
parentjoin_rule -> join_policy (diff)
downloadsynapse-cd087a265db8037ce2fe158ddc0e9b35a612d4bb.tar.xz
Don't use redundant inlineCallbacks
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/group_server.py5
1 files changed, 1 insertions, 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