diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-11-30 16:40:10 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-12-03 15:40:57 -0600 |
| commit | b8e2ab2f5502b68da2c50e62542bf743e66b1958 (patch) | |
| tree | 01b9381cfbf1ce906230cbcec88d31407472ead6 /mediagoblin/init | |
| parent | a4768df0ca2e956f245e0833331ed8abb203937a (diff) | |
| download | mediagoblin-b8e2ab2f5502b68da2c50e62542bf743e66b1958.tar.lz mediagoblin-b8e2ab2f5502b68da2c50e62542bf743e66b1958.tar.xz mediagoblin-b8e2ab2f5502b68da2c50e62542bf743e66b1958.zip | |
Starting to deprecate the app_config, global_config by attaching stuff to app
- app.global_config, app.app_config
- making setup_crypto use app.app_config
- setting app.workbench_manager
Diffstat (limited to 'mediagoblin/init')
| -rw-r--r-- | mediagoblin/init/__init__.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index e0711416..b6421e06 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -28,6 +28,8 @@ from mediagoblin.tools.pluginapi import hook_runall from mediagoblin.tools.workbench import WorkbenchManager from mediagoblin.storage import storage_system_from_config +from mediagoblin.tools.transition import DISABLE_GLOBALS + class Error(Exception): pass @@ -154,4 +156,7 @@ def setup_workbench(): workbench_manager = WorkbenchManager(app_config['workbench_path']) - setup_globals(workbench_manager=workbench_manager) + if not DISABLE_GLOBALS: + setup_globals(workbench_manager=workbench_manager) + + return workbench_manager |