diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:52 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:52 +0100 |
| commit | 6efb2b0ad44b4cfb1f05a77c1a5a22b527758b37 (patch) | |
| tree | 56c11988292ef856c99e8fb4f9b08b648e5d93d8 /synapse/handlers/e2e_room_keys.py | |
| parent | Merge branch 'develop' into babolivier/mark_unread (diff) | |
| parent | Discard RDATA from already seen positions. (#7648) (diff) | |
| download | synapse-6efb2b0ad44b4cfb1f05a77c1a5a22b527758b37.tar.xz | |
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'synapse/handlers/e2e_room_keys.py')
| -rw-r--r-- | synapse/handlers/e2e_room_keys.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py index 9abaf13b8f..2efea801bc 100644 --- a/synapse/handlers/e2e_room_keys.py +++ b/synapse/handlers/e2e_room_keys.py @@ -16,8 +16,6 @@ import logging -from six import iteritems - from twisted.internet import defer from synapse.api.errors import ( @@ -205,8 +203,8 @@ class E2eRoomKeysHandler(object): ) to_insert = [] # batch the inserts together changed = False # if anything has changed, we need to update the etag - for room_id, room in iteritems(room_keys["rooms"]): - for session_id, room_key in iteritems(room["sessions"]): + for room_id, room in room_keys["rooms"].items(): + for session_id, room_key in room["sessions"].items(): if not isinstance(room_key["is_verified"], bool): msg = ( "is_verified must be a boolean in keys for session %s in" |