Backport deferred.addTimeout

Twisted 16.0 doesn't have addTimeout, so let's backport it.

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)