summary refs log tree commit diff
path: root/synapse/handlers/account_data.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-10-31 12:32:07 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-10-31 12:32:07 -0400
commit9c94b48bf154fff1ac3550213ddb65b33fbb6ba8 (patch)
treee7ad5ba3aa90d3cb57906bf38d3c2cac352e95d3 /synapse/handlers/account_data.py
parentclean up code a bit (diff)
parentUpdate black to 19.10b0 (#6304) (diff)
downloadsynapse-9c94b48bf154fff1ac3550213ddb65b33fbb6ba8.tar.xz
Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify
Diffstat (limited to 'synapse/handlers/account_data.py')
-rw-r--r--synapse/handlers/account_data.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/account_data.py b/synapse/handlers/account_data.py
index 38bc67191c..2d7e6df6e4 100644
--- a/synapse/handlers/account_data.py
+++ b/synapse/handlers/account_data.py
@@ -38,9 +38,10 @@ class AccountDataEventSource(object):
                 {"type": "m.tag", "content": {"tags": room_tags}, "room_id": room_id}
             )
 
-        account_data, room_account_data = (
-            yield self.store.get_updated_account_data_for_user(user_id, last_stream_id)
-        )
+        (
+            account_data,
+            room_account_data,
+        ) = yield self.store.get_updated_account_data_for_user(user_id, last_stream_id)
 
         for account_data_type, content in account_data.items():
             results.append({"type": account_data_type, "content": content})