summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-11-09 15:20:35 +0000
committerGitHub <noreply@github.com>2017-11-09 15:20:35 +0000
commit618c7b816ab13659c52687057ae26f1e3f617c94 (patch)
tree604bb0079b9f015c9336c3d43b1e6f8b216526ca /synapse/storage
parentMerge pull request #2651 from matrix-org/erikj/update_group_room_settings (diff)
parentFix 'NoneType' not iterable in /deactivate (diff)
downloadsynapse-618c7b816ab13659c52687057ae26f1e3f617c94.tar.xz
Merge pull request #2656 from matrix-org/rav/fix_deactivate
Fix 'NoneType' not iterable in /deactivate
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/registration.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index 9c4f61da76..71748de733 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -241,7 +241,6 @@ class RegistrationStore(background_updates.BackgroundUpdateStore):
             "user_set_password_hash", user_set_password_hash_txn
         )
 
-    @defer.inlineCallbacks
     def user_delete_access_tokens(self, user_id, except_token_id=None,
                                   device_id=None):
         """
@@ -290,7 +289,7 @@ class RegistrationStore(background_updates.BackgroundUpdateStore):
 
             return tokens_and_devices
 
-        yield self.runInteraction(
+        return self.runInteraction(
             "user_delete_access_tokens", f,
         )