Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PEP8ify

This commit is contained in:
Erik Johnston 2014-11-11 18:00:13 +00:00
parent 37900a92db
commit 61ecb13bf0
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
synapse/handlers/message.py
View File

@ -16,7 +16,6 @@
from twisted.internet import defer from twisted.internet import defer
from synapse.api.constants import Membership from synapse.api.constants import Membership
from synapse.api.events.room import RoomTopicEvent
from synapse.api.errors import RoomError from synapse.api.errors import RoomError
from synapse.streams.config import PaginationConfig from synapse.streams.config import PaginationConfig
from ._base import BaseHandler from ._base import BaseHandler
@ -26,7 +25,6 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class MessageHandler(BaseHandler): class MessageHandler(BaseHandler):
def __init__(self, hs): def __init__(self, hs):
@ -59,7 +57,8 @@ class MessageHandler(BaseHandler):
# user_id=sender_id # user_id=sender_id
# ) # )
# TODO (erikj): Once we work out the correct c-s api we need to think on how to do this. # TODO (erikj): Once we work out the correct c-s api we need to think
# on how to do this.
defer.returnValue(None) defer.returnValue(None)
@ -110,7 +109,9 @@ class MessageHandler(BaseHandler):
data_source = self.hs.get_event_sources().sources["room"] data_source = self.hs.get_event_sources().sources["room"]
if not pagin_config.from_token: if not pagin_config.from_token:
pagin_config.from_token = yield self.hs.get_event_sources().get_current_token() pagin_config.from_token = (
yield self.hs.get_event_sources().get_current_token()
)
user = self.hs.parse_userid(user_id) user = self.hs.parse_userid(user_id)
@ -247,8 +248,10 @@ class MessageHandler(BaseHandler):
d = { d = {
"room_id": event.room_id, "room_id": event.room_id,
"membership": event.membership, "membership": event.membership,
"visibility": ("public" if event.room_id in "visibility": (
public_room_ids else "private"), "public" if event.room_id in public_room_ids
else "private"
),
} }
if event.membership == Membership.INVITE: if event.membership == Membership.INVITE:
@ -277,7 +280,9 @@ class MessageHandler(BaseHandler):
current_state = yield self.state_handler.get_current_state( current_state = yield self.state_handler.get_current_state(
event.room_id event.room_id
) )
d["state"] = [self.hs.serialize_event(c) for c in current_state] d["state"] = [
self.hs.serialize_event(c) for c in current_state
]
except: except:
logger.exception("Failed to get snapshot") logger.exception("Failed to get snapshot")
@ -288,5 +293,3 @@ class MessageHandler(BaseHandler):
} }
defer.returnValue(ret) defer.returnValue(ret)