diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2018-07-23 10:03:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 10:03:28 +0100 |
| commit | 9b34f3ea3af233d70412565290468092cf3c5984 (patch) | |
| tree | dcfc00333a843cdc3a011249ef78f8438804dbd4 /synapse/events | |
| parent | add trailing comma (diff) | |
| parent | Make the rest of the .iterwhatever go away (#3562) (diff) | |
| download | synapse-9b34f3ea3af233d70412565290468092cf3c5984.tar.xz | |
Merge branch 'develop' into matthew/sync_deleted_devices
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/snapshot.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index bcd9bb5946..f83a1581a6 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +from six import iteritems + from frozendict import frozendict from twisted.internet import defer @@ -159,7 +161,7 @@ def _encode_state_dict(state_dict): return [ (etype, state_key, v) - for (etype, state_key), v in state_dict.iteritems() + for (etype, state_key), v in iteritems(state_dict) ] |