summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-05-02 13:26:17 +0100
committerRichard van der Hoff <richard@matrix.org>2017-05-02 13:26:17 +0100
commit2e996271fe7c7acc828e19535ba2eec0b503f9e3 (patch)
tree1190b9c521adbb03c3317f55f2b78407cce9282b /synapse
parentMerge pull request #2163 from matrix-org/erikj/fix_invite_state (diff)
downloadsynapse-2e996271fe7c7acc828e19535ba2eec0b503f9e3.tar.xz
Instantiate DeferredTimedOutError correctly
Call `super` correctly, so that we correctly initialise the `errcode` field.

Fixes https://github.com/matrix-org/synapse/issues/2179.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/util/__init__.py2
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):