Merge pull request #2656 from matrix-org/rav/fix_deactivate

Fix 'NoneType' not iterable in /deactivate
This commit is contained in:
Richard van der Hoff 2017-11-09 15:20:35 +00:00 committed by GitHub
commit 618c7b816a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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,
)