diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-07-30 23:33:06 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-07-30 23:33:06 -0400 |
| commit | c1f0a5636c9df647209794661627668547ce929a (patch) | |
| tree | 464db1ef298b1f110c5ea1003ef1ed019000ab41 /synapse/util/async_helpers.py | |
| parent | add changelog file (diff) | |
| parent | Merge pull request #5793 from matrix-org/erikj/fix_bg_update (diff) | |
| download | synapse-c1f0a5636c9df647209794661627668547ce929a.tar.xz | |
Merge branch 'develop' into cross-signing_hidden
Diffstat (limited to 'synapse/util/async_helpers.py')
| -rw-r--r-- | synapse/util/async_helpers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/util/async_helpers.py b/synapse/util/async_helpers.py index 58a6b8764f..f1c46836b1 100644 --- a/synapse/util/async_helpers.py +++ b/synapse/util/async_helpers.py @@ -366,7 +366,7 @@ class ReadWriteLock(object): new_defer.callback(None) self.key_to_current_readers.get(key, set()).discard(new_defer) - defer.returnValue(_ctx_manager()) + return _ctx_manager() @defer.inlineCallbacks def write(self, key): @@ -396,7 +396,7 @@ class ReadWriteLock(object): if self.key_to_current_writer[key] == new_defer: self.key_to_current_writer.pop(key) - defer.returnValue(_ctx_manager()) + return _ctx_manager() def _cancelled_to_timed_out_error(value, timeout): |