From 3eb152f7d6321f556a3ee26f42a1bdf23544fc51 Mon Sep 17 00:00:00 2001 From: Filip Valder Date: Fri, 25 Nov 2016 18:56:55 +0100 Subject: [PATCH] simplify things --- module_build_service/config.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/module_build_service/config.py b/module_build_service/config.py index a62dcd4e..80c6f4c4 100644 --- a/module_build_service/config.py +++ b/module_build_service/config.py @@ -29,11 +29,8 @@ from os import sys from module_build_service import logger -imp.load_source('mbs_runtime_config', '/etc/module-build-service/config.py') - -DevConfiguration = mbs_runtime_config.DevConfiguration -TestConfiguration = mbs_runtime_config.TestConfiguration -ProdConfiguration = mbs_runtime_config.ProdConfiguration +mbs_runtime_config = imp.load_source('mbs_runtime_config', + '/etc/module-build-service/config.py') def init_config(app): @@ -47,11 +44,11 @@ def _init_app_config(app): app.config.from_envvar("MBS_SETTINGS", silent=True) here = sys.path[0] if any(['nosetests' in arg for arg in sys.argv]): - app.config.from_object('TestConfiguration') + app.config.from_object('mbs_runtime_config.TestConfiguration') elif here not in ('/usr/bin', '/bin', '/usr/local/bin'): - app.config.from_object('DevConfiguration') + app.config.from_object('mbs_runtime_config.DevConfiguration') else: - app.config.from_object('ProdConfiguration') + app.config.from_object('mbs_runtime_config.ProdConfiguration') class Config(object):