diff options
| author | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
| commit | c50ad14bae20d2a8448bb9fe78e919958dc9d233 (patch) | |
| tree | 3b6b3221cb11b16a105d1edf9e4ffe9519c3900a /synapse/util/async.py | |
| parent | Allow sign in using email address (diff) | |
| parent | Merge pull request #211 from matrix-org/email_in_use (diff) | |
| download | synapse-c50ad14bae20d2a8448bb9fe78e919958dc9d233.tar.xz | |
Merge branch 'develop' into email_login
Diffstat (limited to 'synapse/util/async.py')
| -rw-r--r-- | synapse/util/async.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py index 5a1d545c96..7bf2d38bb8 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py @@ -51,7 +51,7 @@ class ObservableDeferred(object): object.__setattr__(self, "_observers", set()) def callback(r): - self._result = (True, r) + object.__setattr__(self, "_result", (True, r)) while self._observers: try: self._observers.pop().callback(r) @@ -60,7 +60,7 @@ class ObservableDeferred(object): return r def errback(f): - self._result = (False, f) + object.__setattr__(self, "_result", (False, f)) while self._observers: try: self._observers.pop().errback(f) @@ -97,3 +97,8 @@ class ObservableDeferred(object): def __setattr__(self, name, value): setattr(self._deferred, name, value) + + def __repr__(self): + return "<ObservableDeferred object at %s, result=%r, _deferred=%r>" % ( + id(self), self._result, self._deferred, + ) |