OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix lint errors

pull/302/head
Daniel Wagner-Hall 2015-10-06 10:13:05 -05:00
parent d4bb28c59b
commit fcd9ba8802
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/federation/federation_client.py
View File

@ -372,7 +372,6 @@ class FederationClient(FederationBase):
pdu_dict = ret["event"] pdu_dict = ret["event"]
logger.debug("Got response to make_join: %s", pdu_dict) logger.debug("Got response to make_join: %s", pdu_dict)
defer.returnValue( defer.returnValue(

7
synapse/rest/client/v1/room.py
View File

@ -17,7 +17,7 @@
from twisted.internet import defer from twisted.internet import defer
from base import ClientV1RestServlet, client_path_pattern 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.streams.config import PaginationConfig
from synapse.api.constants import EventTypes, Membership from synapse.api.constants import EventTypes, Membership
from synapse.types import UserID, RoomID, RoomAlias from synapse.types import UserID, RoomID, RoomAlias
@ -424,7 +424,6 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
): ):
raise SynapseError(400, "Missing user_id key.") raise SynapseError(400, "Missing user_id key.")
id_server = content["id_server"] id_server = content["id_server"]
medium = content["medium"] medium = content["medium"]
address = content["address"] address = content["address"]
@ -556,7 +555,9 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
# TODO: Check for success # TODO: Check for success
token = data["token"] token = data["token"]
public_key = data["public_key"] 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.returnValue((token, public_key, key_validity_url))
@defer.inlineCallbacks @defer.inlineCallbacks