commit 8258dad124ddf02d6af43edb548bfe33d7e1ce7c
author Andrew Pickford <anpickford@googlemail.com> Mon Sep 04 17:09:28 2017 +0200
committer Andrew Pickford <anpickford@googlemail.com> Mon Sep 04 17:09:28 2017 +0200
tree c56f8191072d19a96ca0ab9ed0c6099680cf2c8f
parent fbb1306871cdc75e419e292da60ebaa5a00ddf32

add OPT_ prefix to allow and inventory options

reclass/defaults.py

diff --git a/reclass/defaults.py b/reclass/defaults.py
index b21babd..4c2c903 100644
--- a/reclass/defaults.py
+++ b/reclass/defaults.py
@@ -19,6 +19,14 @@
 OPT_OUTPUT = 'yaml'
 OPT_IGNORE_CLASS_NOTFOUND = False
 
+OPT_ALLOW_SCALAR_OVER_DICT = False
+OPT_ALLOW_SCALAR_OVER_LIST = False
+OPT_ALLOW_LIST_OVER_SCALAR = False
+OPT_ALLOW_DICT_OVER_SCALAR = False
+
+OPT_INVENTORY_IGNORE_FAILED_NODE = False
+OPT_INVENTORY_IGNORE_FAILED_RENDER = False
+
 CONFIG_FILE_SEARCH_PATH = [os.getcwd(),
                            os.path.expanduser('~'),
                            OPT_INVENTORY_BASE_URI,
@@ -32,13 +40,5 @@
 PARAMETER_DICT_KEY_OVERRIDE_PREFIX = '~'
 ESCAPE_CHARACTER = '\\'
 
-ALLOW_SCALAR_OVER_DICT = False
-ALLOW_SCALAR_OVER_LIST = False
-ALLOW_LIST_OVER_SCALAR = False
-ALLOW_DICT_OVER_SCALAR = False
-
 AUTOMATIC_RECLASS_PARAMETERS = True
-
 DEFAULT_ENVIRONMENT = 'base'
-INVENTORY_IGNORE_FAILED_NODE = False
-INVENTORY_IGNORE_FAILED_RENDER = False

reclass/settings.py

diff --git a/reclass/settings.py b/reclass/settings.py
index af804dc..246ac83 100644
--- a/reclass/settings.py
+++ b/reclass/settings.py
@@ -4,18 +4,18 @@
 class Settings(object):
 
     def __init__(self, options={}):
-        self.allow_scalar_over_dict = options.get('allow_scalar_over_dict', ALLOW_SCALAR_OVER_DICT)
-        self.allow_scalar_over_list = options.get('allow_scalar_over_list', ALLOW_SCALAR_OVER_LIST)
-        self.allow_list_over_scalar = options.get('allow_list_over_scalar', ALLOW_LIST_OVER_SCALAR)
-        self.allow_dict_over_scalar = options.get('allow_dict_over_scalar', ALLOW_DICT_OVER_SCALAR)
+        self.allow_scalar_over_dict = options.get('allow_scalar_over_dict', OPT_ALLOW_SCALAR_OVER_DICT)
+        self.allow_scalar_over_list = options.get('allow_scalar_over_list', OPT_ALLOW_SCALAR_OVER_LIST)
+        self.allow_list_over_scalar = options.get('allow_list_over_scalar', OPT_ALLOW_LIST_OVER_SCALAR)
+        self.allow_dict_over_scalar = options.get('allow_dict_over_scalar', OPT_ALLOW_DICT_OVER_SCALAR)
         self.automatic_parameters = options.get('automatic_parameters', AUTOMATIC_RECLASS_PARAMETERS)
         self.default_environment = options.get('default_environment', DEFAULT_ENVIRONMENT)
         self.delimiter = options.get('delimiter', PARAMETER_INTERPOLATION_DELIMITER)
         self.dict_key_override_prefix = options.get('dict_key_override_prefix', PARAMETER_DICT_KEY_OVERRIDE_PREFIX)
         self.escape_character = options.get('escape_character', ESCAPE_CHARACTER)
         self.export_sentinels = options.get('export_sentinels', EXPORT_SENTINELS)
-        self.inventory_ignore_failed_node = options.get('inventory_ignore_failed_node', INVENTORY_IGNORE_FAILED_NODE)
-        self.inventory_ignore_failed_render = options.get('inventory_ignore_failed_render', INVENTORY_IGNORE_FAILED_RENDER)
+        self.inventory_ignore_failed_node = options.get('inventory_ignore_failed_node', OPT_INVENTORY_IGNORE_FAILED_NODE)
+        self.inventory_ignore_failed_render = options.get('inventory_ignore_failed_render', OPT_INVENTORY_IGNORE_FAILED_RENDER)
         self.reference_sentinels = options.get('reference_sentinels', REFERENCE_SENTINELS)
         self.ignore_class_notfound = options.get('ignore_class_notfound', OPT_IGNORE_CLASS_NOTFOUND)