summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-07-26 13:29:46 +0100
committerRichard van der Hoff <richard@matrix.org>2016-07-26 13:29:46 +0100
commit9ad8d9b17c398130ce66206199cf2a903026cc56 (patch)
tree2c17ec0dc88469486edfee37dfdf8025360dec9a /synapse/app
parentDelete refresh tokens when deleting devices (diff)
parentMerge pull request #951 from matrix-org/rav/flake8 (diff)
downloadsynapse-9ad8d9b17c398130ce66206199cf2a903026cc56.tar.xz
Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/__init__.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py
index 1bc4279807..9c2b627590 100644
--- a/synapse/app/__init__.py
+++ b/synapse/app/__init__.py
@@ -16,13 +16,11 @@
 import sys
 sys.dont_write_bytecode = True
 
-from synapse.python_dependencies import (
-    check_requirements, MissingRequirementError
-)  # NOQA
+from synapse import python_dependencies   # noqa: E402
 
 try:
-    check_requirements()
-except MissingRequirementError as e:
+    python_dependencies.check_requirements()
+except python_dependencies.MissingRequirementError as e:
     message = "\n".join([
         "Missing Requirement: %s" % (e.message,),
         "To install run:",