summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-03-15 17:44:39 +0000
committerMark Haines <mark.haines@matrix.org>2016-03-15 17:44:39 +0000
commit6df1c79c226c9207321122080fcc1d67f260aa3e (patch)
treeb6316d84c8ae70a23c071492cd608c8341ee7d3d /synapse/util
parentHook up adding a pusher to the notifier for replication. (diff)
parentMerge pull request #646 from matrix-org/erikj/reject_invite_federation (diff)
downloadsynapse-6df1c79c226c9207321122080fcc1d67f260aa3e.tar.xz
Merge branch 'develop' into markjh/pushers_stream
Diffstat (limited to 'synapse/util')
-rw-r--r--synapse/util/caches/stream_change_cache.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/util/caches/stream_change_cache.py b/synapse/util/caches/stream_change_cache.py
index a1aec7aa55..ea8a74ca69 100644
--- a/synapse/util/caches/stream_change_cache.py
+++ b/synapse/util/caches/stream_change_cache.py
@@ -99,9 +99,7 @@ class StreamChangeCache(object):
             keys = self._cache.keys()
             i = keys.bisect_right(stream_pos)
 
-            return (
-                self._cache[k] for k in keys[i:]
-            )
+            return [self._cache[k] for k in keys[i:]]
         else:
             return None