summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-09-05 16:19:50 +0100
committerErik Johnston <erik@matrix.org>2018-09-05 16:19:50 +0100
commit7419764351aa2b2f00f363beaee6ec53c02c492e (patch)
tree3678f50a67ba4a2ac6a50e32cce96241ca2122c3 /synapse
parentMerge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings (diff)
downloadsynapse-7419764351aa2b2f00f363beaee6ec53c02c492e.tar.xz
User iter* during sync state calculations
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/sync.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index ef20c2296c..0965cf2fc5 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1729,17 +1729,17 @@ def _calculate_state(
     event_id_to_key = {
         e: key
         for key, e in itertools.chain(
-            timeline_contains.items(),
-            previous.items(),
-            timeline_start.items(),
-            current.items(),
+            iteritems(timeline_contains),
+            iteritems(previous),
+            iteritems(timeline_start),
+            iteritems(current),
         )
     }
 
-    c_ids = set(e for e in current.values())
-    ts_ids = set(e for e in timeline_start.values())
-    p_ids = set(e for e in previous.values())
-    tc_ids = set(e for e in timeline_contains.values())
+    c_ids = set(e for e in itervalues(current))
+    ts_ids = set(e for e in itervalues(timeline_start))
+    p_ids = set(e for e in itervalues(previous))
+    tc_ids = set(e for e in itervalues(timeline_contains))
 
     # If we are lazyloading room members, we explicitly add the membership events
     # for the senders in the timeline into the state block returned by /sync,