Merge branch 'fix-7596' of https://github.com/kilburn/ansible into kilburn-fix-7596
This commit is contained in:
commit
0fa5100a2c
1 changed files with 13 additions and 12 deletions
|
@ -1003,21 +1003,22 @@ def is_list_of_strings(items):
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def _listify(a):
|
|
||||||
if not isinstance(a, (list, tuple)):
|
|
||||||
return [a,]
|
|
||||||
else:
|
|
||||||
return a
|
|
||||||
|
|
||||||
def list_union(a, b):
|
def list_union(a, b):
|
||||||
set_a = set(_listify(a))
|
result = []
|
||||||
set_b = set(_listify(b))
|
for x in a:
|
||||||
return list(set_a.union(set_b))
|
if x not in result:
|
||||||
|
result.append(x)
|
||||||
|
for x in b:
|
||||||
|
if x not in result:
|
||||||
|
result.append(x)
|
||||||
|
return result
|
||||||
|
|
||||||
def list_intersection(a, b):
|
def list_intersection(a, b):
|
||||||
set_a = set(_listify(a))
|
result = []
|
||||||
set_b = set(_listify(b))
|
for x in a:
|
||||||
return list(set_a.intersection(set_b))
|
if x in b and x not in result:
|
||||||
|
result.append(x)
|
||||||
|
return result
|
||||||
|
|
||||||
def safe_eval(expr, locals={}, include_exceptions=False):
|
def safe_eval(expr, locals={}, include_exceptions=False):
|
||||||
'''
|
'''
|
||||||
|
|
Loading…
Reference in a new issue