summary refs log tree commit diff
path: root/synapse/crypto/keyclient.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-22 14:21:08 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-22 14:21:08 +0100
commitf30d47c87651f92b69be224e016bda2cd7285f04 (patch)
treeefb5f114a05477dce2b3fbe2c85f82d546b34fa3 /synapse/crypto/keyclient.py
parentMerge branch 'develop' into key_distribution (diff)
downloadsynapse-f30d47c87651f92b69be224e016bda2cd7285f04.tar.xz
Implement remote key lookup api
Diffstat (limited to 'synapse/crypto/keyclient.py')
-rw-r--r--synapse/crypto/keyclient.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/crypto/keyclient.py b/synapse/crypto/keyclient.py

index 2452c7a26e..4911f0896b 100644 --- a/synapse/crypto/keyclient.py +++ b/synapse/crypto/keyclient.py
@@ -26,7 +26,7 @@ import logging logger = logging.getLogger(__name__) KEY_API_V1 = b"/_matrix/key/v1/" -KEY_API_V2 = b"/_matrix/key/v2/local" + @defer.inlineCallbacks def fetch_server_key(server_name, ssl_context_factory, path=KEY_API_V1): @@ -94,8 +94,8 @@ class SynapseKeyClientProtocol(HTTPClient): if status != b"200": # logger.info("Non-200 response from %s: %s %s", # self.transport.getHost(), status, message) - error = SynapseKeyClientError("Non-200 response %r from %r" % - (status, self.host) + error = SynapseKeyClientError( + "Non-200 response %r from %r" % (status, self.host) ) error.status = status self.errback(error)