diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-06-04 00:09:17 +0300 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-06-04 00:09:17 +0300 |
| commit | 28f09fcdd51796dd5036cb74e62b7a74d753f4be (patch) | |
| tree | 40f098938d04cf93c8f7bb7aa82af879479b3334 /synapse/events/__init__.py | |
| parent | more comments (diff) | |
| parent | Merge pull request #3317 from thegcat/feature/3312-add_ipv6_to_blacklist_exam... (diff) | |
| download | synapse-28f09fcdd51796dd5036cb74e62b7a74d753f4be.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/events/__init__.py')
| -rw-r--r-- | synapse/events/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index c3ff85c49a..cb08da4984 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -146,7 +146,7 @@ class EventBase(object): return field in self._event_dict def items(self): - return self._event_dict.items() + return list(self._event_dict.items()) class FrozenEvent(EventBase): |