diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-04-27 12:52:30 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-04-27 12:52:30 +0100 |
| commit | 9d2c1b8429996cb9766ac636034485e2a1d685cc (patch) | |
| tree | 39e35ad98c742fdfddc208293388bb4c936af7ab /synapse/http/__init__.py | |
| parent | Use deferred.addTimeout instead of time_bound_deferred (diff) | |
| download | synapse-9d2c1b8429996cb9766ac636034485e2a1d685cc.tar.xz | |
Backport deferred.addTimeout
Twisted 16.0 doesn't have addTimeout, so let's backport it.
Diffstat (limited to 'synapse/http/__init__.py')
| -rw-r--r-- | synapse/http/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/__init__.py b/synapse/http/__init__.py index 20e568bc43..0d47ccdb59 100644 --- a/synapse/http/__init__.py +++ b/synapse/http/__init__.py @@ -28,7 +28,7 @@ class RequestTimedOutError(SynapseError): def cancelled_to_request_timed_out_error(value): """Turns CancelledErrors into RequestTimedOutErrors. - For use with deferred.addTimeout() + For use with async.add_timeout_to_deferred """ if isinstance(value, failure.Failure): value.trap(CancelledError) |