summary refs log tree commit diff
path: root/synapse/util/async_helpers.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-06-17 14:38:15 +0100
committerErik Johnston <erik@matrix.org>2020-06-17 14:38:15 +0100
commit8ba10868011ad7d4a48f5d61cbe3326dc8d4ea47 (patch)
tree8c9a40281198725bb690889a1d659104d1c7f70e /synapse/util/async_helpers.py
parentMerge branch 'release-v1.15.1' into matrix-org-hotfixes (diff)
parentAdd support for using rust-python-jaeger-reporter (#7697) (diff)
downloadsynapse-8ba10868011ad7d4a48f5d61cbe3326dc8d4ea47.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/util/async_helpers.py')
-rw-r--r--synapse/util/async_helpers.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/util/async_helpers.py b/synapse/util/async_helpers.py

index f7af2bca7f..65abf0846e 100644 --- a/synapse/util/async_helpers.py +++ b/synapse/util/async_helpers.py
@@ -19,8 +19,6 @@ import logging from contextlib import contextmanager from typing import Dict, Sequence, Set, Union -from six.moves import range - import attr from twisted.internet import defer @@ -95,7 +93,7 @@ class ObservableDeferred(object): This returns a brand new deferred that is resolved when the underlying deferred is resolved. Interacting with the returned deferred does not - effect the underdlying deferred. + effect the underlying deferred. """ if not self._result: d = defer.Deferred()