diff options
| author | David Baker <dave@matrix.org> | 2016-04-29 10:05:20 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-04-29 10:05:20 +0100 |
| commit | acded821c4ff9da11ce7f916ca8b0f369bcb4e87 (patch) | |
| tree | 6a797cfae11a8cf64277ff878c090d7905db9d19 /synapse/rest/key | |
| parent | Remove vector specific style (diff) | |
| parent | Fix more typos in per-request metrics (diff) | |
| download | synapse-acded821c4ff9da11ce7f916ca8b0f369bcb4e87.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
Diffstat (limited to 'synapse/rest/key')
| -rw-r--r-- | synapse/rest/key/v1/server_key_resource.py | 1 | ||||
| -rw-r--r-- | synapse/rest/key/v2/remote_key_resource.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/key/v1/server_key_resource.py b/synapse/rest/key/v1/server_key_resource.py index 3db3838b7e..bd4fea5774 100644 --- a/synapse/rest/key/v1/server_key_resource.py +++ b/synapse/rest/key/v1/server_key_resource.py @@ -49,7 +49,6 @@ class LocalKey(Resource): """ def __init__(self, hs): - self.hs = hs self.version_string = hs.version_string self.response_body = encode_canonical_json( self.response_json_object(hs.config) diff --git a/synapse/rest/key/v2/remote_key_resource.py b/synapse/rest/key/v2/remote_key_resource.py index 9552016fec..7209d5a37d 100644 --- a/synapse/rest/key/v2/remote_key_resource.py +++ b/synapse/rest/key/v2/remote_key_resource.py @@ -97,7 +97,7 @@ class RemoteKey(Resource): self.async_render_GET(request) return NOT_DONE_YET - @request_handler + @request_handler() @defer.inlineCallbacks def async_render_GET(self, request): if len(request.postpath) == 1: @@ -122,7 +122,7 @@ class RemoteKey(Resource): self.async_render_POST(request) return NOT_DONE_YET - @request_handler + @request_handler() @defer.inlineCallbacks def async_render_POST(self, request): content = parse_json_object_from_request(request) |