summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-27 19:15:36 +0000
committerErik Johnston <erik@matrix.org>2017-02-27 19:15:36 +0000
commit64a2cef9bb2b0cf62b2a72f63c25c4781c8354e2 (patch)
tree4751c2b6ddda4e7a28977f93cd3617999a379d56 /synapse/handlers
parentMerge pull request #1904 from Pneumaticat/patch-1 (diff)
downloadsynapse-64a2cef9bb2b0cf62b2a72f63c25c4781c8354e2.tar.xz
Pop rather than del from dict
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 996bfd0e23..06d4530177 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -1096,7 +1096,7 @@ class FederationHandler(BaseHandler): if prev_id != event.event_id: results[(event.type, event.state_key)] = prev_id else: - del results[(event.type, event.state_key)] + results.pop((event.type, event.state_key)) defer.returnValue(results.values()) else: