wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed exception handling for hashable test

Browse source
This commit is contained in:
Brian Coca 2014-05-26 08:52:57 -04:00
parent 0dce5dae26
commit 8f58ae3305
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/ansible/runner/filter_plugins/core.py
View file

@ -23,6 +23,7 @@ import types
import pipes import pipes
import glob import glob
import re import re
import collections
import operator as py_operator import operator as py_operator
from ansible import errors from ansible import errors
from ansible.utils import md5s from ansible.utils import md5s
@ -140,38 +141,38 @@ def regex_replace(value='', pattern='', replacement='', ignorecase=False):
return _re.sub(replacement, value) return _re.sub(replacement, value)
def unique(a): def unique(a):
try: if isinstance(a,collections.Hashable):
c = set(a) c = set(a)
except TypeError, e: else:
c = [] c = []
c = filter(lambda x: x not in c, a) c = filter(lambda x: x not in c, a)
return c return c
def intersect(a, b): def intersect(a, b):
try: if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
c = set(a) & set(b) c = set(a) & set(b)
except TypeError, e: else:
c = filter(lambda x: x in b, a) c = filter(lambda x: x in b, a)
return c return c
def difference(a, b): def difference(a, b):
try: if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
c = set(a) - set(b) c = set(a) - set(b)
except TypeError, e: else:
c = filter(lambda x: x not in b, a) c = filter(lambda x: x not in b, a)
return c return c
def symmetric_difference(a, b): def symmetric_difference(a, b):
try: if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
c = set(a) ^ set(b) c = set(a) ^ set(b)
except TypeError, e: else:
c = filter(lambda x: x not in intersect(a,b), union(a,b)) c = filter(lambda x: x not in intersect(a,b), union(a,b))
return c return c
def union(a, b): def union(a, b):
try: if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
c = set(a) | set(b) c = set(a) | set(b)
except TypeError, e: else:
c = a + b c = a + b
return c return c