forked from MirrorHub/synapse
Merge branch 'develop' into single_source_version_and_dependencies
This commit is contained in:
commit
5e54365234
7 changed files with 12 additions and 12 deletions
|
@ -134,7 +134,7 @@ class SynapseHomeServer(HomeServer):
|
|||
logger.info("Attaching %s to path %s", resource, full_path)
|
||||
last_resource = self.root_resource
|
||||
for path_seg in full_path.split('/')[1:-1]:
|
||||
if not path_seg in last_resource.listNames():
|
||||
if path_seg not in last_resource.listNames():
|
||||
# resource doesn't exist, so make a "dummy resource"
|
||||
child_resource = Resource()
|
||||
last_resource.putChild(path_seg, child_resource)
|
||||
|
|
|
@ -709,7 +709,7 @@ class PresenceHandler(BaseHandler):
|
|||
|
||||
# TODO(paul) permissions checks
|
||||
|
||||
if not user in self._remote_sendmap:
|
||||
if user not in self._remote_sendmap:
|
||||
self._remote_sendmap[user] = set()
|
||||
|
||||
self._remote_sendmap[user].add(origin)
|
||||
|
|
|
@ -48,7 +48,7 @@ class ClientDirectoryServer(ClientV1RestServlet):
|
|||
user, client = yield self.auth.get_user_by_req(request)
|
||||
|
||||
content = _parse_json(request)
|
||||
if not "room_id" in content:
|
||||
if "room_id" not in content:
|
||||
raise SynapseError(400, "Missing room_id key",
|
||||
errcode=Codes.BAD_JSON)
|
||||
|
||||
|
|
Loading…
Reference in a new issue