diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-06-15 07:03:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 07:03:36 -0400 |
| commit | bd6dc17221741d4ceae05ae769a70696ae939336 (patch) | |
| tree | a1313d5dbdc0785aba2066e859b58ad90edf10fa /synapse/events | |
| parent | Fix warnings about losing log context during UI auth. (#7688) (diff) | |
| download | synapse-bd6dc17221741d4ceae05ae769a70696ae939336.tar.xz | |
Replace iteritems/itervalues/iterkeys with native versions. (#7692)
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/__init__.py | 4 | ||||
| -rw-r--r-- | synapse/events/snapshot.py | 4 |
2 files changed, 2 insertions, 6 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 diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index 7c5f620d09..f94cdcbaba 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -14,8 +14,6 @@ # limitations under the License. from typing import Optional, Union -from six import iteritems - import attr from frozendict import frozendict @@ -341,7 +339,7 @@ def _encode_state_dict(state_dict): if state_dict is None: return None - return [(etype, state_key, v) for (etype, state_key), v in iteritems(state_dict)] + return [(etype, state_key, v) for (etype, state_key), v in state_dict.items()] def _decode_state_dict(input): |