diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-11-09 15:20:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-09 15:20:35 +0000 |
| commit | 618c7b816ab13659c52687057ae26f1e3f617c94 (patch) | |
| tree | 604bb0079b9f015c9336c3d43b1e6f8b216526ca /synapse | |
| parent | Merge pull request #2651 from matrix-org/erikj/update_group_room_settings (diff) | |
| parent | Fix 'NoneType' not iterable in /deactivate (diff) | |
| download | synapse-618c7b816ab13659c52687057ae26f1e3f617c94.tar.xz | |
Merge pull request #2656 from matrix-org/rav/fix_deactivate
Fix 'NoneType' not iterable in /deactivate
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/registration.py | 3 |
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, ) |