summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-03 13:35:17 +0000
committerErik Johnston <erik@matrix.org>2015-02-03 13:35:17 +0000
commit77a076bd25fc355c49251bcf489c0511c0f0f0af (patch)
tree232e56f5ec6ebf6fe49ed0b888c879adcaf85cc6
parentSpelling (diff)
downloadsynapse-77a076bd25fc355c49251bcf489c0511c0f0f0af.tar.xz
Set combinations is | and not +
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index b9b2e25d1f..653ab0dbfa 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -114,9 +114,9 @@ class FederationHandler(BaseHandler):
 
         event_ids = set()
         if state:
-            event_ids += {e.event_id for e in state}
+            event_ids |= {e.event_id for e in state}
         if auth_chain:
-            event_ids += {e.event_id for e in auth_chain}
+            event_ids |= {e.event_id for e in auth_chain}
 
         seen_ids = (yield self.store.have_events(event_ids)).keys()