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/events/__init__.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/events/__init__.py')
| -rw-r--r-- | synapse/events/__init__.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index 533ba327f5..cc5deca75b 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -20,8 +20,6 @@ import os from distutils.util import strtobool from typing import Dict, Optional, Type -import six - from unpaddedbase64 import encode_base64 from synapse.api.room_versions import EventFormatVersions, RoomVersion, RoomVersions @@ -290,7 +288,7 @@ class EventBase(metaclass=abc.ABCMeta): return list(self._dict.items()) def keys(self): - return six.iterkeys(self._dict) + return self._dict.keys() def prev_event_ids(self): """Returns the list of prev event IDs. The order matches the order |