From 79815acc6e2accf76bbadcb99dbcf4900a0cac89 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 3 Dec 2013 16:29:45 -0500 Subject: [PATCH] Fall back on MITX_FEATURES env variable if FEATURES isn't found For a smoother transition to the new world --- cms/envs/aws.py | 3 ++- lms/envs/aws.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 8853ccf431..7d596194f4 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -138,7 +138,8 @@ COURSES_WITH_UNSAFE_CODE = ENV_TOKENS.get("COURSES_WITH_UNSAFE_CODE", []) TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) -for feature, value in ENV_TOKENS.get('FEATURES', {}).items(): +ENV_FEATURES = ENV_TOKENS.get('FEATURES', ENV_TOKENS.get('MITX_FEATURES', {})) +for feature, value in ENV_FEATURES.items(): FEATURES[feature] = value LOGGING = get_logger_config(LOG_DIR, diff --git a/lms/envs/aws.py b/lms/envs/aws.py index abb382edba..2b7f309ea8 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -210,7 +210,8 @@ USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N) for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []): INSTALLED_APPS += (app,) -for feature, value in ENV_TOKENS.get('FEATURES', {}).items(): +ENV_FEATURES = ENV_TOKENS.get('FEATURES', ENV_TOKENS.get('MITX_FEATURES', {})) +for feature, value in ENV_FEATURES.items(): FEATURES[feature] = value WIKI_ENABLED = ENV_TOKENS.get('WIKI_ENABLED', WIKI_ENABLED)