summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-28 10:01:19 +0000
committerErik Johnston <erik@matrix.org>2017-02-28 10:02:54 +0000
commit848cf95ea088ea6bff209d8fdb7bdb809d7aa8fa (patch)
tree4a1f6edadad3509feff112b2f7f685a9e6adc455 /synapse/handlers
parentmerge in right archlinux package, thanks to @saram-kon from https://github.co... (diff)
downloadsynapse-848cf95ea088ea6bff209d8fdb7bdb809d7aa8fa.tar.xz
Pop with default value to stop throwing
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 06d4530177..ed0fa51e7f 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:
-                    results.pop((event.type, event.state_key))
+                    results.pop((event.type, event.state_key), None)
 
             defer.returnValue(results.values())
         else: