summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 10:13:05 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 10:13:05 -0500
commitfcd9ba8802fcd111db08d2f51c8ac715c028cb1b (patch)
treea57db0d18a6a5369301e62da30c65450cd6299d4 /synapse/rest
parentRevert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_fed... (diff)
downloadsynapse-fcd9ba8802fcd111db08d2f51c8ac715c028cb1b.tar.xz
Fix lint errors
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/room.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index ba37061290..ff84affea3 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -17,7 +17,7 @@
 from twisted.internet import defer
 
 from base import ClientV1RestServlet, client_path_pattern
-from synapse.api.errors import SynapseError, Codes, AuthError
+from synapse.api.errors import SynapseError, Codes
 from synapse.streams.config import PaginationConfig
 from synapse.api.constants import EventTypes, Membership
 from synapse.types import UserID, RoomID, RoomAlias
@@ -424,7 +424,6 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
                 ):
                     raise SynapseError(400, "Missing user_id key.")
 
-
                 id_server = content["id_server"]
                 medium = content["medium"]
                 address = content["address"]
@@ -556,7 +555,9 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
         # TODO: Check for success
         token = data["token"]
         public_key = data["public_key"]
-        key_validity_url = "https://%s/_matrix/identity/api/v1/pubkey/isvalid" % (id_server,)
+        key_validity_url = "https://%s/_matrix/identity/api/v1/pubkey/isvalid" % (
+            id_server,
+        )
         defer.returnValue((token, public_key, key_validity_url))
 
     @defer.inlineCallbacks