inject config, never allow global

freedomofpress · Sep 26, 2017 · dd8dea7 · dd8dea7
1 parent 6570610
commit dd8dea7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/securedrop/source.py b/securedrop/source.py
@@ -3,7 +3,7 @@
 
 from source_app import create_app
 
-app = create_app()
+app = create_app(config)
 
 
 if __name__ == "__main__":  # pragma: no cover

diff --git a/securedrop/source_app/__init__.py b/securedrop/source_app/__init__.py
@@ -7,7 +7,6 @@
 from os import path
 from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
 
-import config as global_config
 import crypto_util
 import i18n
 import store
@@ -21,10 +20,7 @@
 from source_app.utils import logged_in
 
 
-def create_app(config=None):
-    if config is None:
-        config = global_config
-
+def create_app(config):
     app = Flask(__name__,
                 template_folder=config.SOURCE_TEMPLATES_DIR,
                 static_folder=path.join(config.SECUREDROP_ROOT, 'static'))