summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-09-07 13:44:54 +0100
committerRichard van der Hoff <richard@matrix.org>2020-09-07 13:44:54 +0100
commitd74e8f28753e0fca8ae6c9f47f248a2abf9d998a (patch)
treee3df12529ee5480daed23131d58fa8cbe77b70c9 /scripts-dev
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentAdd cross-signing sigs to the `keys` object (#8234) (diff)
downloadsynapse-d74e8f28753e0fca8ae6c9f47f248a2abf9d998a.tar.xz
Merge branch 'release-v1.20.0' into matrix-org-hotfixes
Diffstat (limited to 'scripts-dev')
-rw-r--r--scripts-dev/hash_history.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts-dev/hash_history.py b/scripts-dev/hash_history.py

index bf3862a386..89acb52e6a 100644 --- a/scripts-dev/hash_history.py +++ b/scripts-dev/hash_history.py
@@ -15,7 +15,7 @@ from synapse.storage.pdu import PduStore from synapse.storage.signatures import SignatureStore -class Store(object): +class Store: _get_pdu_tuples = PduStore.__dict__["_get_pdu_tuples"] _get_pdu_content_hashes_txn = SignatureStore.__dict__["_get_pdu_content_hashes_txn"] _get_prev_pdu_hashes_txn = SignatureStore.__dict__["_get_prev_pdu_hashes_txn"]