diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-02 17:18:50 +0000 |
---|---|---|
committer | review.rocks <nobody@review.rocks> | 2016-02-02 17:18:50 +0000 |
commit | d83d004ccdb7ace1dcb51b8acf7645bc176b10a5 (patch) | |
tree | 009a6132dd0c507fb68a449efc247519d2a8aab7 /synapse/app/homeserver.py | |
parent | Merge pull request #549 from matrix-org/erikj/sync (diff) | |
download | synapse-d83d004ccdb7ace1dcb51b8acf7645bc176b10a5.tar.xz |
Fix flake8 warnings for new flake8
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-x | synapse/app/homeserver.py | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index e5066c48ef..c3066d6a0d 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -14,27 +14,22 @@ # See the License for the specific language governing permissions and # limitations under the License. +import synapse + +import contextlib +import logging +import os +import re +import resource +import subprocess import sys -from synapse.rest import ClientRestResource +import time -sys.dont_write_bytecode = True from synapse.python_dependencies import ( - check_requirements, DEPENDENCY_LINKS, MissingRequirementError + check_requirements, DEPENDENCY_LINKS ) -if __name__ == '__main__': - try: - check_requirements() - except MissingRequirementError as e: - message = "\n".join([ - "Missing Requirement: %s" % (e.message,), - "To install run:", - " pip install --upgrade --force \"%s\"" % (e.dependency,), - "", - ]) - sys.stderr.writelines(message) - sys.exit(1) - +from synapse.rest import ClientRestResource from synapse.storage.engines import create_engine, IncorrectDatabaseSetup from synapse.storage import are_all_users_on_domain from synapse.storage.prepare_database import UpgradeDatabaseException @@ -73,17 +68,6 @@ from synapse import events from daemonize import Daemonize -import synapse - -import contextlib -import logging -import os -import re -import resource -import subprocess -import time - - logger = logging.getLogger("synapse.app.homeserver") |