1 files changed, 3 insertions, 7 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 2bfd0a40e0..1e3dccf5a8 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -237,9 +237,7 @@ class FederationHandler(BaseHandler):
             )
         )
 
-        def redact_disallowed(event_and_state):
-            event, state = event_and_state
-
+        def redact_disallowed(event, state):
             if not state:
                 return event
 
@@ -273,13 +271,11 @@ class FederationHandler(BaseHandler):
 
             return event
 
-        res = map(redact_disallowed, [
-            (e, event_to_state[e.event_id])
+        defer.returnValue([
+            redact_disallowed(e, event_to_state[e.event_id])
             for e in events
         ])
 
-        defer.returnValue(res)
-
     @log_function
     @defer.inlineCallbacks
     def backfill(self, dest, room_id, limit, extremities=[]):