summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-13 17:28:43 +0100
committerErik Johnston <erik@matrix.org>2015-08-13 17:28:43 +0100
commit129ee4e149095aa71c284cc5e1e7efa653222729 (patch)
treeb1b02e3ec821888644edd1d389d6adbca6c6459a /synapse/handlers/federation.py
parentAdd metrics to the receipts cache (diff)
parentMerge pull request #219 from matrix-org/erikj/dictionary_cache (diff)
downloadsynapse-129ee4e149095aa71c284cc5e1e7efa653222729.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py10
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=[]):