diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 11:51:55 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 11:51:55 +0100 |
| commit | f38df51e8dd8e462871c9bfb8fb49a89d157bf2d (patch) | |
| tree | 08736d0f751f3ee3ee8f0c8f7b1cbce5de5569a7 /synapse/app/homeserver.py | |
| parent | Use more descriptive error code (diff) | |
| parent | Merge pull request #305 from matrix-org/markjh/v2_sync_api (diff) | |
| download | synapse-f38df51e8dd8e462871c9bfb8fb49a89d157bf2d.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 6 |
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 |