diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-09-04 11:53:52 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-09-04 11:53:52 +0100 |
| commit | a5153afe76075fcb095829e4b9cafedb047b6f50 (patch) | |
| tree | 4add092955162c9573d0aef23080c64d31d64989 | |
| parent | Address review comments (diff) | |
| parent | Apply suggestions from code review (diff) | |
| download | synapse-a5153afe76075fcb095829e4b9cafedb047b6f50.tar.xz | |
Merge branch 'anoa/v2_lookup' of github.com:matrix-org/synapse into anoa/v2_lookup
| -rw-r--r-- | synapse/handlers/identity.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py index 2d15dced79..dd52426cab 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py @@ -301,7 +301,7 @@ class IdentityHandler(BaseHandler): server with Returns: - str: the matrix ID of the 3pid, or None if it is not recognized. + str|None: the matrix ID of the 3pid, or None if it is not recognized. """ # If an access token is present, add it to the query params of the hash_details request query_params = {} @@ -313,7 +313,7 @@ class IdentityHandler(BaseHandler): hash_details = None try: hash_details = yield self.http_client.get_json( - "%s/_matrix/identity/v2/hash_details" % id_server, query_params + "%s/_matrix/identity/v2/hash_details" % (id_server, ), query_params ) if not isinstance(hash_details, dict): logger.warn( |