Reduce complexity of Templar._lookup slightly (#73277)

* A little more complexity reduction
* restore logic
* Readability
* Add ran check back
* Add clog

changelogs/fragments/73277-reduce-lookup-complexity.yml

@@ -0,0 +1,3 @@
+minor_changes:
+- Templar - reduce the complexity of ``Templar._lookup``
+  (https://github.com/ansible/ansible/pull/73277)

lib/ansible/template/__init__.py

@@ -56,6 +56,7 @@ from ansible.template.vars import AnsibleJ2Vars
 from ansible.utils.collection_loader import AnsibleCollectionRef
 from ansible.utils.display import Display
 from ansible.utils.collection_loader._collection_finder import _get_collection_metadata
+from ansible.utils.listify import listify_lookup_plugin_terms
 from ansible.utils.unsafe_proxy import wrap_var
 
 display = Display()
@@ -974,12 +975,13 @@ class Templar:
     def _lookup(self, name, *args, **kwargs):
         instance = lookup_loader.get(name, loader=self._loader, templar=self)
 
-        if instance is not None:
+        if instance is None:
+            raise AnsibleError("lookup plugin (%s) not found" % name)
+
         wantlist = kwargs.pop('wantlist', False)
         allow_unsafe = kwargs.pop('allow_unsafe', C.DEFAULT_ALLOW_UNSAFE_LOOKUPS)
         errors = kwargs.pop('errors', 'strict')
 
-            from ansible.utils.listify import listify_lookup_plugin_terms
         loop_terms = listify_lookup_plugin_terms(terms=args, templar=self, loader=self._loader, fail_on_undefined=True, convert_bare=False)
         # safely catch run failures per #5059
         try:
@@ -996,12 +998,15 @@ class Templar:
                     display.display(msg, log_only=True)
                 else:
                     raise AnsibleError(to_native(msg))
-                ran = [] if wantlist else None
+            return [] if wantlist else None
+
+        if ran and allow_unsafe is False:
+            if self.cur_context:
+                self.cur_context.unsafe = True
 
-            if ran and not allow_unsafe:
             if wantlist:
-                    ran = wrap_var(ran)
+                return wrap_var(ran)
-                else:
+
             try:
                 if self.jinja2_native and isinstance(ran[0], NativeJinjaText):
                     ran = wrap_var(NativeJinjaText(",".join(ran)))
@@ -1021,11 +1026,7 @@ class Templar:
                 else:
                     ran = wrap_var(ran)
 
-                if self.cur_context:
-                    self.cur_context.unsafe = True
         return ran
-        else:
-            raise AnsibleError("lookup plugin (%s) not found" % name)
 
     def do_template(self, data, preserve_trailing_newlines=True, escape_backslashes=True, fail_on_undefined=None, overrides=None, disable_lookups=False):
         if self.jinja2_native and not isinstance(data, string_types):

lib/ansible/utils/listify.py

@@ -21,7 +21,6 @@ __metaclass__ = type
 
 from ansible.module_utils.six import string_types
 from ansible.module_utils.common._collections_compat import Iterable
-from ansible.template.safe_eval import safe_eval
 
 
 __all__ = ['listify_lookup_plugin_terms']