diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-18 13:54:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-18 13:54:27 +0100 |
| commit | 3accee1a8c2804620713ac4ff068a4a18a7de192 (patch) | |
| tree | 5bfad3c1e8653713f8e14062732f892797279a92 /synapse/util/async.py | |
| parent | Merge pull request #2136 from bbigras/patch-1 (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-3accee1a8c2804620713ac4ff068a4a18a7de192.tar.xz | |
Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse v0.21.0
Diffstat (limited to 'synapse/util/async.py')
| -rw-r--r-- | synapse/util/async.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py index 35380bf8ed..1453faf0ef 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py @@ -89,6 +89,11 @@ class ObservableDeferred(object): deferred.addCallbacks(callback, errback) def observe(self): + """Observe the underlying deferred. + + Can return either a deferred if the underlying deferred is still pending + (or has failed), or the actual value. Callers may need to use maybeDeferred. + """ if not self._result: d = defer.Deferred() @@ -101,7 +106,7 @@ class ObservableDeferred(object): return d else: success, res = self._result - return defer.succeed(res) if success else defer.fail(res) + return res if success else defer.fail(res) def observers(self): return self._observers |