diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-18 14:53:13 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-18 14:53:13 +0000 |
| commit | 7f79a6405bb58c4476b169f6a72efd6cb2a8d1a1 (patch) | |
| tree | 32142838794cb446c581a954d5bea5a044b8a5eb /synapse/events/__init__.py | |
| parent | Merge pull request #652 from matrix-org/erikj/delete_alias (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/get_event (diff) | |
| download | synapse-7f79a6405bb58c4476b169f6a72efd6cb2a8d1a1.tar.xz | |
Merge pull request #656 from matrix-org/erikj/get_event
Dedupe requested event list in _get_events
Diffstat (limited to 'synapse/events/__init__.py')
| -rw-r--r-- | synapse/events/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index bbfa5a7265..abed6b5e6b 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -168,5 +168,7 @@ class FrozenEvent(EventBase): def __repr__(self): return "<FrozenEvent event_id='%s', type='%s', state_key='%s'>" % ( - self.event_id, self.type, self.get("state_key", None), + self.get("event_id", None), + self.get("type", None), + self.get("state_key", None), ) |