diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-29 13:15:14 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-29 13:15:14 +0100 |
| commit | 4ad8b451559682645c818f6c1180e5f9d42a7eeb (patch) | |
| tree | 94fe0beaaaa4ed8c1bb9451f1274df819d9ce8d7 /synapse/storage/signatures.py | |
| parent | Update the query format used by keyring to match current key v2 spec (diff) | |
| parent | Mention that postgres databases must have the correct charset encoding (diff) | |
| download | synapse-4ad8b451559682645c818f6c1180e5f9d42a7eeb.tar.xz | |
Merge branch 'develop' into key_distribution
Conflicts: synapse/config/homeserver.py
Diffstat (limited to 'synapse/storage/signatures.py')
| -rw-r--r-- | synapse/storage/signatures.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/synapse/storage/signatures.py b/synapse/storage/signatures.py index d0d53770f2..f051828630 100644 --- a/synapse/storage/signatures.py +++ b/synapse/storage/signatures.py @@ -56,7 +56,6 @@ class SignatureStore(SQLBaseStore): "algorithm": algorithm, "hash": buffer(hash_bytes), }, - or_ignore=True, ) def get_event_reference_hashes(self, event_ids): @@ -100,7 +99,7 @@ class SignatureStore(SQLBaseStore): " WHERE event_id = ?" ) txn.execute(query, (event_id, )) - return dict(txn.fetchall()) + return {k: v for k, v in txn.fetchall()} def _store_event_reference_hash_txn(self, txn, event_id, algorithm, hash_bytes): @@ -119,7 +118,6 @@ class SignatureStore(SQLBaseStore): "algorithm": algorithm, "hash": buffer(hash_bytes), }, - or_ignore=True, ) def _get_event_signatures_txn(self, txn, event_id): @@ -164,7 +162,6 @@ class SignatureStore(SQLBaseStore): "key_id": key_id, "signature": buffer(signature_bytes), }, - or_ignore=True, ) def _get_prev_event_hashes_txn(self, txn, event_id): @@ -198,5 +195,4 @@ class SignatureStore(SQLBaseStore): "algorithm": algorithm, "hash": buffer(hash_bytes), }, - or_ignore=True, ) |