diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-06 15:10:55 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-06 15:10:55 +0000 |
| commit | 4317c8e5835f0c15bf882f737d3e3c2a5b85f73f (patch) | |
| tree | 4f1b822a5122529b69f54d7ed7f8b88d772171a5 /synapse/util/jsonobject.py | |
| parent | Fix a couple more storage tests (diff) | |
| download | synapse-4317c8e5835f0c15bf882f737d3e3c2a5b85f73f.tar.xz | |
Implement new replace_state and changed prev_state
`prev_state` is now a list of previous state ids, similiar to prev_events. `replace_state` now points to what we think was replaced.
Diffstat (limited to 'synapse/util/jsonobject.py')
| -rw-r--r-- | synapse/util/jsonobject.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/jsonobject.py b/synapse/util/jsonobject.py index c91eb897a8..e79b68f661 100644 --- a/synapse/util/jsonobject.py +++ b/synapse/util/jsonobject.py @@ -80,7 +80,7 @@ class JsonEncodedObject(object): def get_full_dict(self): d = { - k: v for (k, v) in self.__dict__.items() + k: _encode(v) for (k, v) in self.__dict__.items() if k in self.valid_keys or k in self.internal_keys } d.update(self.unrecognized_keys) |