diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-11-09 15:15:33 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-11-09 15:15:33 +0000 |
| commit | 889102315e07026a8ba5c2b5159b10da9fc7a9b9 (patch) | |
| tree | 2fa8de9f8c96bc554ed4d0dcc184919b9d693fe0 /synapse/storage/registration.py | |
| parent | Merge pull request #2636 from farialima/me-master (diff) | |
| download | synapse-889102315e07026a8ba5c2b5159b10da9fc7a9b9.tar.xz | |
Fix 'NoneType' not iterable in /deactivate
make sure we actually return a value from user_delete_access_tokens
Diffstat (limited to 'synapse/storage/registration.py')
| -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, ) |