Index: QueryParser.py
===================================================================
RCS file: /cvs/gnome/gdesklets/utils/QueryParser.py,v
retrieving revision 1.2
diff -u -r1.2 QueryParser.py
--- QueryParser.py      6 Aug 2004 15:36:27 -0000       1.2
+++ QueryParser.py      6 Aug 2004 20:42:35 -0000
@@ -1,4 +1,4 @@
-from utils import set
+from sets import Set

 #
 # Class for parsing expressions in a simple query language.
@@ -43,12 +43,16 @@
         if (cmd == "AND"):
             query, r1 = self.__parse_ARG(query)
             query, r2 = self.__parse_ARG(query)
-            result = set.intersect(r1, r2)
+            result = Set(r1)
+            result.intersection_update(r2)
+            result = list(result)

         elif (cmd == "OR"):
             query, r1 = self.__parse_ARG(query)
             query, r2 = self.__parse_ARG(query)
-            result = set.join(r1, r2)
+            result = Set(r1)
+            result.union_update(r2)
+            result = list(result)

         elif (cmd == "MATCH"):
             query, r1 = self.__parse_ARG(query)