Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 23:44:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make ObservableDeferred.observe() always return deferred.

Browse source 
This makes it easier to use in an async/await world.

Also fixes a bug where cache descriptors would occaisonally return a raw
value rather than a deferred.
This commit is contained in:
Erik Johnston 2019-10-30 11:35:46 +00:00
parent 46c12918ad
commit 326b3dace7
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
synapse/util/async_helpers.py
View file

@ -86,11 +86,8 @@ class ObservableDeferred(object):
deferred.addCallbacks(callback, errback)
def observe(self):
def observe(self) -> defer.Deferred:
"""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()
@ -105,7 +102,7 @@ class ObservableDeferred(object):
return d
else:
success, res = self._result
return res if success else defer.fail(res)
return defer.succeed(res) if success else defer.fail(res)
def observers(self):
return self._observers