summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-02-10 18:13:25 +0000
committerMark Haines <mark.haines@matrix.org>2015-02-10 18:13:25 +0000
commit5e543652340c5085187db3833c5855d6f3b2eff0 (patch)
tree44610ce67c08606df99e3c6c2898f0c77eecfd02 /synapse/app/homeserver.py
parentAdd the 'setup_requires' and allow easy_install since jenkins uses them (diff)
parentFix code-style (diff)
downloadsynapse-5e543652340c5085187db3833c5855d6f3b2eff0.tar.xz
Merge branch 'develop' into single_source_version_and_dependencies
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 8976ff2e82..ff6680e7da 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -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)