From 23557b6e5a01c9582c35e36331a7090811b9c556 Mon Sep 17 00:00:00 2001 From: Bradley Young Date: Sun, 14 Jul 2013 16:31:37 -0700 Subject: [PATCH] change the name from transpose to "together". Change to use itertools.izip_longest() rather than method cribbed from nested.py --- .../{transpose.py => together.py} | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) rename lib/ansible/runner/lookup_plugins/{transpose.py => together.py} (76%) diff --git a/lib/ansible/runner/lookup_plugins/transpose.py b/lib/ansible/runner/lookup_plugins/together.py similarity index 76% rename from lib/ansible/runner/lookup_plugins/transpose.py rename to lib/ansible/runner/lookup_plugins/together.py index c7a7eb4ffe..795509da4e 100644 --- a/lib/ansible/runner/lookup_plugins/transpose.py +++ b/lib/ansible/runner/lookup_plugins/together.py @@ -1,4 +1,4 @@ -# (c) 2012, Michael DeHaan +# (c) 2013, Bradley Young # # This file is part of Ansible # @@ -18,6 +18,7 @@ import ansible.utils as utils from ansible.utils import safe_eval import ansible.errors as errors +from itertools import izip_longest def flatten(terms): ret = [] @@ -30,20 +31,13 @@ def flatten(terms): ret.append(term) return ret -def transpose(a,b): +class LookupModule(object): """ Transpose a list of arrays: [1, 2, 3], [4, 5, 6] -> [1, 4], [2, 5], [3, 6] - Replace any empty spots in 2nd array with "": - [1, 2], [3] -> [1, 3], [2, ""] + Replace any empty spots in 2nd array with None: + [1, 2], [3] -> [1, 3], [2, None] """ - results = [] - for i in xrange(len(a)): - results.append([a[i], (b[i:i+1]+[""])[0]]) - return results - - -class LookupModule(object): def __init__(self, basedir=None, **kwargs): self.basedir = basedir @@ -65,17 +59,8 @@ class LookupModule(object): terms = self.__lookup_injects(terms, inject) my_list = terms[:] - my_list.reverse() - result = [] if len(my_list) == 0: raise errors.AnsibleError("with_transpose requires at least one element in each list") - result = my_list.pop() - while len(my_list) > 0: - result2 = transpose(result, my_list.pop()) - result = result2 - new_result = [] - for x in result: - new_result.append(flatten(x)) - return new_result + return [flatten(x) for x in izip_longest(*my_list, fillvalue=None)]