summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-10-14 11:40:45 +0100
committerMark Haines <mark.haines@matrix.org>2015-10-14 11:40:45 +0100
commitf50c43464c953b523297f0ecc5acff2c425187eb (patch)
treebd9be856b0112260f3f59a204b530825c9f0458a /synapse/app
parentAdd a get_invites_for_user method to the storage to find out the rooms a user... (diff)
parentMerge pull request #303 from matrix-org/markjh/twisted_debugging (diff)
downloadsynapse-f50c43464c953b523297f0ecc5acff2c425187eb.tar.xz
Merge branch 'develop' into markjh/v2_sync_api
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 190b03e2f7..cf2fa221dc 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -33,11 +33,9 @@ if __name__ == '__main__':
         sys.stderr.writelines(message)
         sys.exit(1)
 
-
 from synapse.storage.engines import create_engine, IncorrectDatabaseSetup
-from synapse.storage import (
-    are_all_users_on_domain, UpgradeDatabaseException,
-)
+from synapse.storage import are_all_users_on_domain
+from synapse.storage.prepare_database import UpgradeDatabaseException
 
 from synapse.server import HomeServer