diff options
| author | Neil Johnson <neil@matrix.org> | 2018-10-25 14:40:06 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-10-25 14:40:06 +0100 |
| commit | f7f487e14c553832a0accf0dcd09b546f9b4a702 (patch) | |
| tree | f6c28616c938cedecc18b7d8326cffa175c7395c /synapse/replication/slave/storage/keys.py | |
| parent | isort (diff) | |
| parent | oops, run the check_isort build (diff) | |
| download | synapse-f7f487e14c553832a0accf0dcd09b546f9b4a702.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocreate_autojoin
Diffstat (limited to 'synapse/replication/slave/storage/keys.py')
| -rw-r--r-- | synapse/replication/slave/storage/keys.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/synapse/replication/slave/storage/keys.py b/synapse/replication/slave/storage/keys.py index 05ed168463..8032f53fec 100644 --- a/synapse/replication/slave/storage/keys.py +++ b/synapse/replication/slave/storage/keys.py @@ -16,7 +16,7 @@ from synapse.storage import DataStore from synapse.storage.keys import KeyStore -from ._base import BaseSlavedStore +from ._base import BaseSlavedStore, __func__ class SlavedKeyStore(BaseSlavedStore): @@ -24,11 +24,11 @@ class SlavedKeyStore(BaseSlavedStore): "_get_server_verify_key" ] - get_server_verify_keys = DataStore.get_server_verify_keys.__func__ - store_server_verify_key = DataStore.store_server_verify_key.__func__ + get_server_verify_keys = __func__(DataStore.get_server_verify_keys) + store_server_verify_key = __func__(DataStore.store_server_verify_key) - get_server_certificate = DataStore.get_server_certificate.__func__ - store_server_certificate = DataStore.store_server_certificate.__func__ + get_server_certificate = __func__(DataStore.get_server_certificate) + store_server_certificate = __func__(DataStore.store_server_certificate) - get_server_keys_json = DataStore.get_server_keys_json.__func__ - store_server_keys_json = DataStore.store_server_keys_json.__func__ + get_server_keys_json = __func__(DataStore.get_server_keys_json) + store_server_keys_json = __func__(DataStore.store_server_keys_json) |