summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-06-05 18:09:13 +0100
committerDavid Baker <dave@matrix.org>2018-06-05 18:09:13 +0100
commitd62162bbec27f8d14274ae56c8a6d0bcaa2941fe (patch)
treebe271d8b2c9dae75b397e915694f8c0708674513
parentDocstring (diff)
downloadsynapse-d62162bbec27f8d14274ae56c8a6d0bcaa2941fe.tar.xz
doc fixes
-rw-r--r--synapse/handlers/identity.py2
-rw-r--r--synapse/http/matrixfederationclient.py12
2 files changed, 7 insertions, 7 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py

index 434eb17ef0..529400955d 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py
@@ -149,7 +149,7 @@ class IdentityHandler(BaseHandler): threepid (dict): Dict with medium & address of binding to be removed Returns: - Deferred + Deferred[bool]: True on success, otherwise False """ logger.debug("unbinding threepid %r from %s", threepid, mxid) if not self.trusted_id_servers: diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 1fa9fb3cb2..6fc0c2296b 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py
@@ -268,16 +268,16 @@ class MatrixFederationHttpClient(object): """ Signs a request by adding an Authorization header to headers_dict Args: - destination (str): The desination home server of the request. May be null if the + destination (bytes): The desination home server of the request. May be None if the destination is an identity server, in which case destination_is must be non-null. - method (str): The HTTP method of the request - url_bytes (str): ? + method (bytes): The HTTP method of the request + url_bytes (bytes): The URI path of the request headers_dict (dict): Dictionary of request headers to append to - content (str): The body of the request - destination_is (str): As 'destination', but if the destination is an identity server + content (bytes): The body of the request + destination_is (bytes): As 'destination', but if the destination is an identity server Returns: - Deferred + None """ request = { "method": method,