diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-08 15:26:26 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-08 15:26:26 +0100 |
| commit | 5834c6178cd8ab8121b0ad87bfe0d3b69a48c21b (patch) | |
| tree | 3d1fe71fc6a53ea65981f814facd80d79d99bf68 /synapse/events | |
| parent | Merge branch 'release-v0.17.1' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-5834c6178cd8ab8121b0ad87bfe0d3b69a48c21b.tar.xz | |
Merge branch 'release-v0.17.2' of github.com:matrix-org/synapse v0.17.2
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/events/snapshot.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index 13154b1723..bcb8f33a58 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -99,7 +99,7 @@ class EventBase(object): return d - def get(self, key, default): + def get(self, key, default=None): return self._event_dict.get(key, default) def get_internal_metadata_dict(self): diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index 8a475417a6..e895b1c450 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -15,9 +15,9 @@ class EventContext(object): - - def __init__(self, current_state=None): - self.current_state = current_state + def __init__(self): + self.current_state_ids = None + self.prev_state_ids = None self.state_group = None self.rejected = False self.push_actions = [] |