Commit 8f58ae33 by Brian Coca

changed exception handling for hashable test

parent 0dce5dae
...@@ -23,6 +23,7 @@ import types ...@@ -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): ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment