From 792c3d93c1a938b913b7a7218f7f078cb795587e Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 3 Nov 2015 15:37:41 -0500 Subject: [PATCH] Remove legacy MITX_FEATURES reference --- cms/envs/aws.py | 2 +- cms/envs/yaml_config.py | 2 +- lms/envs/aws.py | 2 +- lms/envs/yaml_config.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 855a04d49a..e68d120d1d 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -189,7 +189,7 @@ LANGUAGES = ENV_TOKENS.get('LANGUAGES', LANGUAGES) LANGUAGE_CODE = ENV_TOKENS.get('LANGUAGE_CODE', LANGUAGE_CODE) USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N) -ENV_FEATURES = ENV_TOKENS.get('FEATURES', ENV_TOKENS.get('MITX_FEATURES', {})) +ENV_FEATURES = ENV_TOKENS.get('FEATURES', {}) for feature, value in ENV_FEATURES.items(): FEATURES[feature] = value diff --git a/cms/envs/yaml_config.py b/cms/envs/yaml_config.py index 3c863be41b..dc6463f2b7 100644 --- a/cms/envs/yaml_config.py +++ b/cms/envs/yaml_config.py @@ -145,7 +145,7 @@ ENV_TOKENS = convert_tokens(ENV_TOKENS) # into settings some dictionary settings # need to be merged from common.py -ENV_FEATURES = ENV_TOKENS.get('FEATURES', ENV_TOKENS.get('MITX_FEATURES', {})) +ENV_FEATURES = ENV_TOKENS.get('FEATURES', {}) for feature, value in ENV_FEATURES.items(): FEATURES[feature] = value diff --git a/lms/envs/aws.py b/lms/envs/aws.py index e6d4fad4cb..cdb61f972a 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -253,7 +253,7 @@ USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N) for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []): INSTALLED_APPS += (app,) -ENV_FEATURES = ENV_TOKENS.get('FEATURES', ENV_TOKENS.get('MITX_FEATURES', {})) +ENV_FEATURES = ENV_TOKENS.get('FEATURES', {}) for feature, value in ENV_FEATURES.items(): FEATURES[feature] = value diff --git a/lms/envs/yaml_config.py b/lms/envs/yaml_config.py index 4c3c199a18..37284af051 100644 --- a/lms/envs/yaml_config.py +++ b/lms/envs/yaml_config.py @@ -178,7 +178,7 @@ ENV_TOKENS = convert_tokens(ENV_TOKENS) # into settings some dictionary settings # need to be merged from common.py -ENV_FEATURES = ENV_TOKENS.get('FEATURES', ENV_TOKENS.get('MITX_FEATURES', {})) +ENV_FEATURES = ENV_TOKENS.get('FEATURES', {}) for feature, value in ENV_FEATURES.items(): FEATURES[feature] = value