Index: util.py =================================================================== --- util.py (revision 12032) +++ util.py (working copy) @@ -207,19 +207,22 @@ all elements must be hashable.""" + if not incremental: + s = set() + for x in lists: + s.update(filter(None, x)) + return list(s) + new_list = {} for x in lists: for y in filter(None, x): - if incremental: - if y == "-*": - new_list.clear() - elif y.startswith("-"): - new_list.pop(y[1:], None) - else: - new_list[y] = True + if y == "-*": + new_list.clear() + elif y.startswith("-"): + new_list.pop(y[1:], None) else: new_list[y] = True - return new_list.keys() + return list(new_list) def grabdict(myfilename, juststrings=0, empty=0, recursive=0, incremental=1): """