From a7eeb34c64d828539dd6799f2347371a8eabae73 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 12 Aug 2015 16:02:05 +0100
Subject: [PATCH] Simplify staggered deferred lists

---
 synapse/handlers/message.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 2c4af8dc9..8a9e6cf6c 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -406,9 +406,9 @@ class MessageHandler(BaseHandler):
         # Only do N rooms at once
         n = 5
         d_list = [handle_room(e) for e in room_list]
-        for ds in [d_list[i:i + n] for i in range(0, len(d_list), n)]:
+        for i in range(0, len(d_list), n):
             yield defer.gatherResults(
-                ds,
+                d_list[i:i + n],
                 consumeErrors=True
             ).addErrback(unwrapFirstError)