summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-23 17:40:58 +0100
committerErik Johnston <erik@matrix.org>2014-09-23 17:40:58 +0100
commitefea61dc507e1e02f3ac17417bd735a9d750bd12 (patch)
treeb3ca7308b1582aa7ab244dd04ce17e42ce599360 /synapse/storage
parentSYN-12: Implement auth for deletion by adding a 'delete_level' on the ops lev... (diff)
downloadsynapse-efea61dc507e1e02f3ac17417bd735a9d750bd12.tar.xz
Rename 'pruned' to 'pruned_because'
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/__init__.py2
-rw-r--r--synapse/storage/_base.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py

index 46d420b632..ac8ee89ab5 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py
@@ -206,7 +206,7 @@ class DataStore(RoomMemberStore, RoomStore, unrec = { k: v for k, v in event.get_full_dict().items() - if k not in vals.keys() and k not in ["deleted", "pruned"] + if k not in vals.keys() and k not in ["deleted", "pruned_because"] } vals["unrecognized_keys"] = json.dumps(unrec) diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 3aa610c85c..d64119a473 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py
@@ -398,7 +398,7 @@ class SQLBaseStore(object): if del_evs: prune_event(ev) - ev.pruned = del_evs[0] + ev.pruned_because = del_evs[0] return events