diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-17 13:23:44 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-17 13:23:44 +0100 |
| commit | afef6f5d16d9600e11cc2e33efcbcc5fa8b9509f (patch) | |
| tree | ccb3670a75ce04f1a0e87c68bd99f6a8cc02bdc0 /synapse/storage/state.py | |
| parent | Batch _get_linearized_receipts_for_rooms (diff) | |
| parent | Fix bug where we were leaking None into state event lists (diff) | |
| download | synapse-afef6f5d16d9600e11cc2e33efcbcc5fa8b9509f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2
Diffstat (limited to 'synapse/storage/state.py')
| -rw-r--r-- | synapse/storage/state.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py index 185f88fd7c..ecb62e6dfd 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -412,9 +412,10 @@ class StateStore(SQLBaseStore): full=(types is None), ) - results[group].update({ + # We replace here to remove all the entries with None values. + results[group] = { key: value for key, value in state_dict.items() if value - }) + } defer.returnValue(results) |