summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-03 19:19:24 +0100
committerErik Johnston <erik@matrix.org>2014-09-03 19:19:24 +0100
commitbcaea74352034bfad7bc6e157422a2bc3127271e (patch)
treeb0c72b5832e8a15b91c8ad6591410258a1f2f3ec /synapse/handlers
parentImport SynapseError (diff)
downloadsynapse-bcaea74352034bfad7bc6e157422a2bc3127271e.tar.xz
Error code must be an integer
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 43c1b1bd0d..59cbf71d78 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -237,7 +237,7 @@ class FederationHandler(BaseHandler):
         try:
             yield d
         except defer.CancelledError:
-            raise SynapseError("500", "Unable to join remote room")
+            raise SynapseError(500, "Unable to join remote room")
 
         try:
             yield self.store.store_room(