summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-26 09:07:05 +0100
committerGitHub <noreply@github.com>2016-08-26 09:07:05 +0100
commitc1a133a6b6528be90d283c6527b7575e86d0ee35 (patch)
treea69f295e59cc3e39cf6db67ce3adb800707fdab8 /synapse/handlers
parentMerge pull request #1044 from matrix-org/paul/third-party-lookup (diff)
parentFix None check in backfill (diff)
downloadsynapse-c1a133a6b6528be90d283c6527b7575e86d0ee35.tar.xz
Merge pull request #1043 from matrix-org/erikj/backfill_fix
Fix None check in backfill
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 01a761715b..4344a2bd52 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -377,7 +377,9 @@ class FederationHandler(BaseHandler):
                 )).addErrback(unwrapFirstError)
                 auth_events.update({a.event_id: a for a in results if a})
                 required_auth.update(
-                    a_id for event in results for a_id, _ in event.auth_events if event
+                    a_id
+                    for event in results if event
+                    for a_id, _ in event.auth_events
                 )
                 missing_auth = required_auth - set(auth_events)