From f9c60e1a827909236c9b131f534c75f665dedee3 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 14 Jul 2017 10:31:24 -0700 Subject: [PATCH] Make the ConfigManager in constants private All play focused code should access constants via ansible.constants, not via the config API. Even that API should only be used by ansible-config. It should be considered an internal implementation detail to everything else --- lib/ansible/constants.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 1f0e08c0d1b..62e2fbfd44f 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -24,16 +24,16 @@ from string import ascii_letters, digits from ansible.module_utils._text import to_text from ansible.config.manager import ConfigManager -config = ConfigManager() +_config = ConfigManager() # Generate constants from config -for setting in config.data.get_settings(): +for setting in _config.data.get_settings(): vars()[setting.name] = setting.value def mk_boolean(value): ''' moved ''' - return config.make_boolean(value) + return _config.make_boolean(value) # ### CONSTANTS ### yes, actual ones @@ -60,7 +60,7 @@ BECOME_MISSING_STRINGS = { 'ksu': 'No password given', 'pmrun': '' } # FIXME: deal with i18n -BOOL_TRUE = config.data.BOOL_TRUE +BOOL_TRUE = _config.data.BOOL_TRUE DEFAULT_BECOME_PASS = None DEFAULT_PASSWORD_CHARS = to_text(ascii_letters + digits + ".,:-_", errors='strict') # characters included in auto-generated passwords DEFAULT_SUDO_PASS = None