From 52b2c6c9c73d47a269756d8da57b4dcff54e0d21 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 6 Jan 2015 14:56:57 +0000 Subject: Don't include None's in _get_events_txn --- synapse/storage/_base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'synapse') diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 728d1df8fa..a0b7f943fd 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -446,7 +446,7 @@ class SQLBaseStore(object): if not event_ids: return [] - return [ + events = [ self._get_event_txn( txn, event_id, check_redacted=check_redacted, @@ -455,6 +455,8 @@ class SQLBaseStore(object): for event_id in event_ids ] + return [e for e in events if e] + def _get_event_txn(self, txn, event_id, check_redacted=True, get_prev_content=False): sql = ( -- cgit 1.4.1