diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-05-02 13:32:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 13:32:58 +0100 |
| commit | 82475a18d90bef2e5930e4a4dc41cb9cefe947cc (patch) | |
| tree | 5586d6b8769ef046d11a2d0004a0da4d024b7d0f | |
| parent | Merge pull request #2080 from matrix-org/erikj/filter_speed (diff) | |
| parent | Instantiate DeferredTimedOutError correctly (diff) | |
| download | synapse-82475a18d90bef2e5930e4a4dc41cb9cefe947cc.tar.xz | |
Merge pull request #2180 from matrix-org/rav/fix_timeout_on_timeout
Instantiate DeferredTimedOutError correctly
| -rw-r--r-- | synapse/util/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 98a5a26ac5..2a2360ab5d 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -26,7 +26,7 @@ logger = logging.getLogger(__name__) class DeferredTimedOutError(SynapseError): def __init__(self): - super(SynapseError, self).__init__(504, "Timed out") + super(DeferredTimedOutError, self).__init__(504, "Timed out") def unwrapFirstError(failure): |