summary refs log tree commit diff
path: root/synapse/events/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-18 14:31:44 +0000
committerErik Johnston <erik@matrix.org>2016-03-18 14:31:44 +0000
commit58e207cd77b3b68b1908078418c9c9e9c3830ea5 (patch)
tree54ce0030245917f10d19e8a35c0af351e684635b /synapse/events/__init__.py
parentDedupe requested event list in _get_events (diff)
downloadsynapse-58e207cd77b3b68b1908078418c9c9e9c3830ea5.tar.xz
Don't assume existence of event_id in __str__
Diffstat (limited to 'synapse/events/__init__.py')
-rw-r--r--synapse/events/__init__.py4
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),
         )