now unique actually works, all operations also now use it to return
unique lists.pull/4420/head
parent
8f58ae3305
commit
ce8c8ab146
|
@ -145,35 +145,37 @@ def unique(a):
|
||||||
c = set(a)
|
c = set(a)
|
||||||
else:
|
else:
|
||||||
c = []
|
c = []
|
||||||
c = filter(lambda x: x not in c, a)
|
for x in a:
|
||||||
|
if x not in c:
|
||||||
|
c.append(x)
|
||||||
return c
|
return c
|
||||||
|
|
||||||
def intersect(a, b):
|
def intersect(a, b):
|
||||||
if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
|
if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
|
||||||
c = set(a) & set(b)
|
c = set(a) & set(b)
|
||||||
else:
|
else:
|
||||||
c = filter(lambda x: x in b, a)
|
c = unique(filter(lambda x: x in b, a))
|
||||||
return c
|
return c
|
||||||
|
|
||||||
def difference(a, b):
|
def difference(a, b):
|
||||||
if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
|
if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
|
||||||
c = set(a) - set(b)
|
c = set(a) - set(b)
|
||||||
else:
|
else:
|
||||||
c = filter(lambda x: x not in b, a)
|
c = unique(filter(lambda x: x not in b, a))
|
||||||
return c
|
return c
|
||||||
|
|
||||||
def symmetric_difference(a, b):
|
def symmetric_difference(a, b):
|
||||||
if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
|
if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
|
||||||
c = set(a) ^ set(b)
|
c = set(a) ^ set(b)
|
||||||
else:
|
else:
|
||||||
c = filter(lambda x: x not in intersect(a,b), union(a,b))
|
c = unique(filter(lambda x: x not in intersect(a,b), union(a,b)))
|
||||||
return c
|
return c
|
||||||
|
|
||||||
def union(a, b):
|
def union(a, b):
|
||||||
if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
|
if isinstance(a,collections.Hashable) and isinstance(b,collections.Hashable):
|
||||||
c = set(a) | set(b)
|
c = set(a) | set(b)
|
||||||
else:
|
else:
|
||||||
c = a + b
|
c = unique(a + b)
|
||||||
return c
|
return c
|
||||||
|
|
||||||
def version_compare(value, version, operator='eq', strict=False):
|
def version_compare(value, version, operator='eq', strict=False):
|
||||||
|
|
Loading…
Reference in New Issue