unified boolean function

optimized boolean function
fixes #17815

lib/ansible/constants.py

@@ -32,15 +32,13 @@ from ansible.utils.path import makedirs_safe
 
 BOOL_TRUE = frozenset([ "true", "t", "y", "1", "yes", "on" ])
 
-# copied from utils, avoid circular reference fun :)
 def mk_boolean(value):
+    ret = value
+    if not isinstance(value, bool):
         if value is None:
-        return False
+            ret = False
-    val = str(value)
+        ret = (str(value).lower() in BOOL_TRUE)
-    if val.lower() in BOOL_TRUE:
+    return ret
-        return True
-    else:
-        return False
 
 def shell_expand(path, expand_relative_paths=False):
     '''

lib/ansible/executor/play_iterator.py

@@ -22,15 +22,13 @@ __metaclass__ = type
 import fnmatch
 
 from ansible.compat.six import iteritems
-
 from ansible import constants as C
-
 from ansible.errors import AnsibleError
 from ansible.playbook.block import Block
 from ansible.playbook.task import Task
 from ansible.playbook.role_include import IncludeRole
 
-from ansible.utils.boolean import boolean
+boolean = C.mk_boolean
 
 __all__ = ['PlayIterator']
 

lib/ansible/playbook/base.py

@@ -33,7 +33,7 @@ from ansible.errors import AnsibleParserError, AnsibleUndefinedVariable
 from ansible.module_utils._text import to_text
 from ansible.playbook.attribute import Attribute, FieldAttribute
 from ansible.parsing.dataloader import DataLoader
-from ansible.utils.boolean import boolean
+from ansible.constants import mk_boolean as boolean
 from ansible.utils.vars import combine_vars, isidentifier
 
 try:

lib/ansible/playbook/play_context.py

@@ -34,7 +34,8 @@ from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_bytes
 from ansible.playbook.attribute import FieldAttribute
 from ansible.playbook.base import Base
-from ansible.utils.boolean import boolean
+
+boolean = C.mk_boolean
 
 __all__ = ['PlayContext']
 

lib/ansible/plugins/action/assemble.py

@@ -25,10 +25,10 @@ import os.path
 import re
 import tempfile
 
+from ansible.constants import mk_boolean as boolean
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_native, to_text
 from ansible.plugins.action import ActionBase
-from ansible.utils.boolean import boolean
 from ansible.utils.hashing import checksum_s
 
 

lib/ansible/plugins/action/copy.py

@@ -24,10 +24,10 @@ import os
 import stat
 import tempfile
 
+from ansible.constants import mk_boolean as boolean
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.plugins.action import ActionBase
-from ansible.utils.boolean import boolean
 from ansible.utils.hashing import checksum
 
 

lib/ansible/plugins/action/fetch.py

@@ -20,10 +20,10 @@ __metaclass__ = type
 import os
 import base64
 
+from ansible.constants import mk_boolean as boolean
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_bytes
 from ansible.plugins.action import ActionBase
-from ansible.utils.boolean import boolean
 from ansible.utils.hashing import checksum, checksum_s, md5, secure_hash
 from ansible.utils.path import makedirs_safe
 

lib/ansible/plugins/action/patch.py

@@ -20,10 +20,10 @@ __metaclass__ = type
 
 import os
 
+from ansible.constants import mk_boolean as boolean
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_native
 from ansible.plugins.action import ActionBase
-from ansible.utils.boolean import boolean
 
 
 class ActionModule(ActionBase):

lib/ansible/plugins/action/set_fact.py

@@ -20,8 +20,8 @@ __metaclass__ = type
 
 from ansible.compat.six import iteritems, string_types
 
+from ansible.constants import mk_boolean as boolean
 from ansible.plugins.action import ActionBase
-from ansible.utils.boolean import boolean
 from ansible.utils.vars import isidentifier
 
 class ActionModule(ActionBase):

lib/ansible/plugins/action/synchronize.py

@@ -22,9 +22,10 @@ import os.path
 from ansible.playbook.play_context import MAGIC_VARIABLE_MAPPING
 from ansible.plugins.action import ActionBase
 from ansible.plugins import connection_loader
-from ansible.utils.boolean import boolean
 from ansible import constants as C
 
+boolean = C.mk_boolean
+
 
 class ActionModule(ActionBase):
 

lib/ansible/plugins/action/template.py

@@ -27,8 +27,8 @@ from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.plugins.action import ActionBase
 from ansible.utils.hashing import checksum_s
-from ansible.utils.boolean import boolean
 
+boolean = C.mk_boolean
 
 class ActionModule(ActionBase):
 

lib/ansible/plugins/action/unarchive.py

@@ -23,7 +23,7 @@ import os
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_native
 from ansible.plugins.action import ActionBase
-from ansible.utils.boolean import boolean
+from ansible.constants import mk_boolean as boolean
 
 
 class ActionModule(ActionBase):

lib/ansible/plugins/connection/ssh.py

@@ -35,9 +35,9 @@ from ansible.errors import AnsibleOptionsError
 from ansible.module_utils.basic import BOOLEANS
 from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.plugins.connection import ConnectionBase
-from ansible.utils.boolean import boolean
 from ansible.utils.path import unfrackpath, makedirs_safe
 
+boolean = C.mk_boolean
 
 try:
     from __main__ import display

lib/ansible/plugins/lookup/first_found.py

@@ -125,7 +125,7 @@ from jinja2.exceptions import UndefinedError
 from ansible.compat.six import string_types
 from ansible.errors import AnsibleFileNotFound, AnsibleLookupError, AnsibleUndefinedVariable
 from ansible.plugins.lookup import LookupBase
-from ansible.utils.boolean import boolean
+from ansible.constants import mk_boolean as boolean
 
 class LookupModule(LookupBase):
 

lib/ansible/plugins/lookup/subelements.py

@@ -21,7 +21,7 @@ from ansible.compat.six import string_types
 from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.listify import listify_lookup_plugin_terms
-from ansible.utils.boolean import boolean
+from ansible.constants import mk_boolean as boolean
 
 FLAGS = ('skip_missing',)
 

lib/ansible/utils/boolean.py

@@ -1,29 +0,0 @@
-# (c) 2012-2014, Michael DeHaan <michael.dehaan@gmail.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-
-def boolean(value):
-    val = str(value)
-    if val.lower() in [ "true", "t", "y", "1", "yes" ]:
-        return True
-    else:
-        return False
-

test/integration/group_vars/all

@@ -13,5 +13,5 @@ test_hash:
 # variables used for conditional testing
 test_bare: true
 test_bare_var: 123
-test_bare_nested_good: "{{test_bare_var}} == 123"
+test_bare_nested_good: "test_bare_var == 123"
 test_bare_nested_bad: "{{test_bare_var}} == 321"