From b47d2e07e15a8a15307f146e0c12e70e5e4ca0cd Mon Sep 17 00:00:00 2001
From: Brian Coca <bcoca@users.noreply.github.com>
Date: Wed, 21 Feb 2018 10:42:54 -0500
Subject: [PATCH] remove query/q (#36315)

* remove query/q

remove and fixed tests for removed func

* paren fix
---
 lib/ansible/template/__init__.py              |  8 +---
 .../targets/lookups/tasks/main.yml            |  2 +-
 test/integration/targets/loops/tasks/main.yml | 48 -------------------
 3 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/lib/ansible/template/__init__.py b/lib/ansible/template/__init__.py
index 1241ed78432..27f0305ad8d 100644
--- a/lib/ansible/template/__init__.py
+++ b/lib/ansible/template/__init__.py
@@ -604,11 +604,6 @@ class Templar:
     def _fail_lookup(self, name, *args, **kwargs):
         raise AnsibleError("The lookup `%s` was found, however lookups were disabled from templating" % name)
 
-    def _query_lookup(self, name, *args, **kwargs):
-        ''' wrapper for lookup, force wantlist true'''
-        kwargs['wantlist'] = True
-        return self._lookup(name, *args, **kwargs)
-
     def _lookup(self, name, *args, **kwargs):
         instance = self._lookup_loader.get(name.lower(), loader=self._loader, templar=self)
 
@@ -699,10 +694,9 @@ class Templar:
                     return data
 
             if disable_lookups:
-                t.globals['query'] = t.globals['q'] = t.globals['lookup'] = self._fail_lookup
+                t.globals['lookup'] = self._fail_lookup
             else:
                 t.globals['lookup'] = self._lookup
-                t.globals['query'] = t.globals['q'] = self._query_lookup
 
             t.globals['finalize'] = self._finalize
 
diff --git a/test/integration/targets/lookups/tasks/main.yml b/test/integration/targets/lookups/tasks/main.yml
index f6a83392d0c..567f7dfcf90 100644
--- a/test/integration/targets/lookups/tasks/main.yml
+++ b/test/integration/targets/lookups/tasks/main.yml
@@ -299,7 +299,7 @@
 
 - name: Test that we can give a list of values to var and receive a list of values back
   set_fact:
-    var_host_info: '{{ query("vars", "ansible_host", "ansible_user") }}'
+    var_host_info: '{{ lookup("vars", "ansible_host", "ansible_user", wantlist=True) }}'
 
 - assert:
     that:
diff --git a/test/integration/targets/loops/tasks/main.yml b/test/integration/targets/loops/tasks/main.yml
index af7e53a5023..5272ae353f0 100644
--- a/test/integration/targets/loops/tasks/main.yml
+++ b/test/integration/targets/loops/tasks/main.yml
@@ -103,54 +103,6 @@
       - 'results6["results"][0]["ping"] == "Hello World"'
       - 'results6["results"][1]["ping"] == "Olá Mundo"'
 
-- name: Test that loop works with a list via the query lookup
-  ping:
-    data: '{{ item }}'
-  loop: '{{ query("list", "Hello World", "Olá Mundo") }}'
-  register: results7
-
-- name: Assert that we ran the module twice with the correct strings
-  assert:
-    that:
-      - 'results7["results"][0]["ping"] == "Hello World"'
-      - 'results7["results"][1]["ping"] == "Olá Mundo"'
-
-- name: Test that loop works with a list in a variable via the query lookup
-  ping:
-    data: '{{ item }}'
-  loop: '{{ q("list", *phrases) }}'
-  register: results8
-
-- name: Assert that we ran the module twice with the correct strings
-  assert:
-    that:
-      - 'results8["results"][0]["ping"] == "Hello World"'
-      - 'results8["results"][1]["ping"] == "Olá Mundo"'
-
-- name: Test that loop works with a list and keyword args
-  ping:
-    data: '{{ item }}'
-  loop: '{{ q("file", "data1.txt", "data2.txt", lstrip=True) }}'
-  register: results9
-
-- name: Assert that we ran the module twice with the correct strings
-  assert:
-    that:
-      - 'results9["results"][0]["ping"] == "Hello World"'
-      - 'results9["results"][1]["ping"] == "Olá Mundo"'
-
-- name: Test that loop works with a list in variable and keyword args
-  ping:
-    data: '{{ item }}'
-  loop: '{{ q("file", lstrip=True, *filenames) }}'
-  register: results10
-
-- name: Assert that we ran the module twice with the correct strings
-  assert:
-    that:
-      - 'results10["results"][0]["ping"] == "Hello World"'
-      - 'results10["results"][1]["ping"] == "Olá Mundo"'
-
 #
 # loop_control/index_var
 #