summary refs log tree commit diff
path: root/synapse/appservice/api.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-16 17:27:30 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-16 17:27:30 +0100
commit4c9a73835b86f948d9d17bd8d3e3205f4fa49bdd (patch)
treebb8bbeaeda9c228d6823bb243bcc91cd74473bbc /synapse/appservice/api.py
parentMerge commit 'e19de43eb' into anoa/dinsic_release_1_21_x (diff)
parentConvert the SimpleHttpClient to async. (#8016) (diff)
downloadsynapse-4c9a73835b86f948d9d17bd8d3e3205f4fa49bdd.tar.xz
Merge commit '88a3ff12f' into anoa/dinsic_release_1_21_x
* commit '88a3ff12f':
  Convert the SimpleHttpClient to async. (#8016)
Diffstat (limited to 'synapse/appservice/api.py')
-rw-r--r--synapse/appservice/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py

index db578bda79..e72a0b9ac0 100644 --- a/synapse/appservice/api.py +++ b/synapse/appservice/api.py
@@ -175,7 +175,7 @@ class ApplicationServiceApi(SimpleHttpClient): urllib.parse.quote(protocol), ) try: - info = yield self.get_json(uri, {}) + info = yield defer.ensureDeferred(self.get_json(uri, {})) if not _is_valid_3pe_metadata(info): logger.warning(