diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-15 14:13:22 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-15 14:13:22 +0100 |
| commit | e8c53b07f2fa5cdd671841cb6feed0f6b3f8d073 (patch) | |
| tree | a8105b0f3a9efd467f10500e933125bf203ab42e /synapse/http/client.py | |
| parent | Use set_defaults(func=) style (diff) | |
| parent | Return a different error from Invalid Password when a user is deactivated (#5... (diff) | |
| download | synapse-e8c53b07f2fa5cdd671841cb6feed0f6b3f8d073.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmd
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 9bc7035c8d..45d5010952 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -45,9 +45,9 @@ from synapse.http import ( cancelled_to_request_timed_out_error, redact_uri, ) +from synapse.logging.context import make_deferred_yieldable from synapse.util.async_helpers import timeout_deferred from synapse.util.caches import CACHE_SIZE_FACTOR -from synapse.util.logcontext import make_deferred_yieldable logger = logging.getLogger(__name__) |