diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 10:53:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-26 10:53:48 +0000 |
| commit | 4c1b799e1b9f8e04f6cd86a0977e28685ac20aea (patch) | |
| tree | fcaea2671bf38721520191c13bb37adf18ef84c5 /synapse/http | |
| parent | Format changelog (diff) | |
| parent | Make sure that we close cursors before returning from a query (#6408) (diff) | |
| download | synapse-4c1b799e1b9f8e04f6cd86a0977e28685ac20aea.tar.xz | |
Merge branch 'develop' into babolivier/context_filters
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 2 | ||||
| -rw-r--r-- | synapse/http/servlet.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 691380abda..16765d54e0 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -530,7 +530,7 @@ class MatrixFederationHttpClient(object): """ Builds the Authorization headers for a federation request Args: - destination (bytes|None): The desination home server of the request. + destination (bytes|None): The desination homeserver of the request. May be None if the destination is an identity server, in which case destination_is must be non-None. method (bytes): The HTTP method of the request diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py index e9a5e46ced..13fcb408a6 100644 --- a/synapse/http/servlet.py +++ b/synapse/http/servlet.py @@ -96,7 +96,7 @@ def parse_boolean_from_args(args, name, default=None, required=False): return {b"true": True, b"false": False}[args[name][0]] except Exception: message = ( - "Boolean query parameter %r must be one of" " ['true', 'false']" + "Boolean query parameter %r must be one of ['true', 'false']" ) % (name,) raise SynapseError(400, message) else: |